report more errors from global plugins

Fixes ElektraInitiative#4044
kodebach · Sep 14, 2021 · ec02242 · ec02242
1 parent 09aff92
commit ec02242
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/libs/elektra/kdb.c b/src/libs/elektra/kdb.c
@@ -794,13 +794,25 @@ static int elektraGetDoUpdateWithGlobalHooks (KDB * handle, Split * split, KeySe
 	{
 	case FIRST:
 		keySetName (parentKey, keyName (initialParent));
-		elektraGlobalGet (handle, ks, parentKey, GETSTORAGE, INIT);
-		elektraGlobalGet (handle, ks, parentKey, GETSTORAGE, MAXONCE);
+		if (elektraGlobalGet (handle, ks, parentKey, GETSTORAGE, INIT) == ELEKTRA_PLUGIN_ERROR)
+		{
+			return -1;
+		}
+		if (elektraGlobalGet (handle, ks, parentKey, GETSTORAGE, MAXONCE) == ELEKTRA_PLUGIN_ERROR)
+		{
+			return -1;
+		}
 		break;
 	case LAST:
 		keySetName (parentKey, keyName (initialParent));
-		elektraGlobalGet (handle, ks, parentKey, PROCGETSTORAGE, INIT);
-		elektraGlobalGet (handle, ks, parentKey, PROCGETSTORAGE, MAXONCE);
+		if (elektraGlobalGet (handle, ks, parentKey, PROCGETSTORAGE, INIT) == ELEKTRA_PLUGIN_ERROR)
+		{
+			return -1;
+		}
+		if (elektraGlobalGet (handle, ks, parentKey, PROCGETSTORAGE, MAXONCE) == ELEKTRA_PLUGIN_ERROR)
+		{
+			return -1;
+		}
 		elektraGlobalError (handle, ks, parentKey, PROCGETSTORAGE, DEINIT);
 		break;
 	default:

diff --git a/tests/shell/gen/highlevel/struct.data.ini b/tests/shell/gen/highlevel/struct.data.ini
@@ -3,6 +3,7 @@ mountpoint=tests_gen_elektra_struct.ini
 
 [mystruct]
 type=struct
+check/type=any
 default=""
 
 [mystruct/a]
@@ -15,6 +16,7 @@ default=8
 
 [myotherstruct]
 type=struct
+check/type=any
 default=""
 gen/struct/depth=2
 
@@ -28,6 +30,7 @@ default=6
 
 [person/_]
 type=struct
+check/type=any
 default=""
 gen/struct/type=Person
 gen/struct/alloc=1
@@ -47,6 +50,7 @@ default=1.80
 
 [person/_/children/#]
 type=struct_ref
+check/type=any
 default=""
 
 [person/_/children]
@@ -56,6 +60,7 @@ check/reference/restrict=../../../person/_
 
 [people/#]
 type=struct_ref
+check/type=any
 default=""
 
 [people]