Merge pull request ElektraInitiative#3183 from ElektraInitiative/fix_memleak

Fix memleak

Author: markus2330

benchmarks/CMakeLists.txt

@@ -33,6 +33,7 @@ endmacro (do_benchmark)
 do_benchmark (large)
 do_benchmark (cmp)
 do_benchmark (createkeys)
+do_benchmark (memoryleak)
 
 # exclude storage and KDB benchmark from mingw
 if (NOT WIN32)

benchmarks/memoryleak.c

@@ -0,0 +1,47 @@
+/**
+ * @file
+ *
+ * @brief Benchmark for KDB
+ *
+ * @copyright BSD License (see LICENSE.md or https://www.libelektra.org)
+ */
+
+#include <stdio.h>
+
+#include <benchmarks.h>
+#include <kdb.h>
+#include <unistd.h>
+
+#define NUM_RUNS 30
+
+int main (void)
+{
+	KDB * handles[NUM_RUNS];
+	KeySet * keysets[NUM_RUNS];
+
+	Key * parentKey = keyNew ("user", KEY_END);
+
+	for (size_t i = 0; i < NUM_RUNS; ++i)
+	{
+		KDB * handle = kdbOpen (parentKey);
+
+		KeySet * ks = ksNew (0, KS_END);
+
+		kdbGet (handle, ks, parentKey);
+
+		printf ("Retrieved %d keys\n", (int) ksGetSize (ks));
+
+		handles[i] = handle;
+		keysets[i] = ks;
+	}
+
+	for (size_t i = 0; i < NUM_RUNS; ++i)
+	{
+		printf ("Freeing %d keys\n", (int) ksGetSize (keysets[i]));
+
+		kdbClose (handles[i], parentKey);
+		ksDel (keysets[i]);
+	}
+
+	keyDel (parentKey);
+}

doc/news/_preparation_next_release.md

@@ -153,6 +153,7 @@ The text below summarizes updates to the [C (and C++)-based libraries](https://w
 - `kdbconfig.h` is no longer included in the installed headers. This is because it could cause conflicts with other
   `config.h`-type headers from applications. _(Klemens Böswirth)_
 - `ksAppendKey`: state that it only fail on memory problems. _(Markus Raab)_
+- Fix memory leak in `kdbGet`. _(Markus Raab)_
 - Implemented `kdberrors.h` directly without generation of the `specification` file because of drastically reduced error code count _(Michael Zronek)_
 - `keyIsDirectBelow` was renamed to `keyIsDirectlyBelow`. _(Philipp Gackstatter)_
 - `keyMeta` was added to provide access to a key's underlying KeySet that holds its metadata keys. _(Philipp Gackstatter)_

src/libs/elektra/kdb.c

@@ -333,6 +333,7 @@ KDB * kdbOpen (Key * errorKey)
 		keySetString (errorKey, keyString (initialParent));
 		keyDel (initialParent);
 		errno = errnosave;
+		ksDel (keys);
 		return 0;
 	case 0:
 		ELEKTRA_ADD_INSTALLATION_WARNING (errorKey, "Initial 'kdbGet()' failed, you should either fix " KDB_DB_INIT