global keyset: fix memproblems

ElektraInitiative · Jan 8, 2019 · 12acc82 · 12acc82
1 parent daccd26
commit 12acc82
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/libs/elektra/kdb.c b/src/libs/elektra/kdb.c
@@ -267,6 +267,7 @@ KDB * kdbOpen (Key * errorKey)
 	handle->modules = ksNew (0, KS_END);
 	if (elektraModulesInit (handle->modules, errorKey) == -1)
 	{
+		ksDel (handle->global);
 		ksDel (handle->modules);
 		elektraFree (handle);
 		ELEKTRA_SET_ERROR (94, errorKey, "elektraModulesInit returned with -1");
@@ -283,6 +284,7 @@ KDB * kdbOpen (Key * errorKey)
 	switch (elektraOpenBootstrap (handle, keys, errorKey))
 	{
 	case -1:
+		ksDel (handle->global);
 		ksDel (handle->modules);
 		elektraFree (handle);
 		ELEKTRA_SET_ERROR (40, errorKey, "could not open default backend");
@@ -784,7 +786,6 @@ int kdbGet (KDB * handle, KeySet * ks, Key * parentKey)
 
 	int errnosave = errno;
 	Key * initialParent = keyDup (parentKey);
-	ksClear (handle->global);
 
 	ELEKTRA_LOG ("now in new kdbGet (%s)", keyName (parentKey));
 
@@ -797,6 +798,8 @@ int kdbGet (KDB * handle, KeySet * ks, Key * parentKey)
 		goto error;
 	}
 
+	ksClear (handle->global);
+
 	elektraGlobalGet (handle, ks, parentKey, PREGETSTORAGE, INIT);
 	elektraGlobalGet (handle, ks, parentKey, PREGETSTORAGE, MAXONCE);
 	elektraGlobalGet (handle, ks, parentKey, PREGETSTORAGE, DEINIT);
@@ -916,9 +919,12 @@ int kdbGet (KDB * handle, KeySet * ks, Key * parentKey)
 	elektraGlobalError (handle, ks, parentKey, POSTGETSTORAGE, MAXONCE);
 	elektraGlobalError (handle, ks, parentKey, POSTGETSTORAGE, DEINIT);
 
-	ksClear (handle->global);
 	keySetName (parentKey, keyName (initialParent));
-	if (handle) splitUpdateFileName (split, handle, parentKey);
+	if (handle)
+	{
+		splitUpdateFileName (split, handle, parentKey);
+		if (handle->global) ksClear (handle->global);
+	}
 	keyDel (initialParent);
 	keyDel (oldError);
 	splitDel (split);
@@ -1321,7 +1327,7 @@ int kdbSet (KDB * handle, KeySet * ks, Key * parentKey)
 	elektraGlobalError (handle, ks, parentKey, POSTROLLBACK, MAXONCE);
 	elektraGlobalError (handle, ks, parentKey, POSTROLLBACK, DEINIT);
 
-	ksClear (handle->global);
+	if (handle->global) ksClear (handle->global);
 	keySetName (parentKey, keyName (initialParent));
 	keyDel (initialParent);
 	splitDel (split);