Merge pull request #2785 from jimklimov/fix-memcheck

Fix `make memcheck`
networkupstools · Jan 26, 2025 · e841840 · e841840
2 parents 66ed615 + 6384e99
commit e841840
Show file tree

Hide file tree

Showing 11 changed files with 363 additions and 127 deletions.
diff --git a/common/nutstream.cpp b/common/nutstream.cpp
@@ -197,6 +197,7 @@ NutStream::status_t NutMemory::putData(const std::string & data) {
  * by packager who knows their system. */
 
 static bool checkExistsWritableDir(const char *s) {
+	DIR	*pd;
 #ifdef DEBUG
 	std::cerr << "checkExistsWritableDir(" << (s ? s : "<null>") << "): ";
 #endif
@@ -207,12 +208,13 @@ static bool checkExistsWritableDir(const char *s) {
 		return false;
 	}
 
-	if (!opendir(s)) {
+	if (!(pd = opendir(s))) {
 #ifdef DEBUG
 		std::cerr << "not a dir" << std::endl;
 #endif
 		return false;
 	}
+	closedir(pd);
 
 	/* POSIX: If the requested access is permitted, access() succeeds
 	 * and shall return 0; otherwise, -1 shall be returned and errno

diff --git a/configure.ac b/configure.ac
@@ -5799,6 +5799,7 @@ m4_foreach_w([SCRIPTFILE], [
  scripts/Solaris/postremove
  scripts/Solaris/preproto.pl
  scripts/Solaris/nut
+ scripts/valgrind/valgrind.sh
  tools/gitlog2changelog.py
  tools/nut-snmpinfo.py
 ], [