logic after null support recovering fixed

* ref 1d4d52c
rejchev · Jul 20, 2023 · 6a615ea · 6a615ea
1 parent caa852a
commit 6a615ea
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/natives/json_a_natives.cpp b/src/natives/json_a_natives.cpp
@@ -179,7 +179,11 @@ cell_t JsonArraySetJson(IPluginContext *pContext, const cell_t *params) {
     if((json = nJansson::PCU::ReadJsonHandle(params[1], pType, &sec, IsArray)) == nullptr)
         return 0;
 
-    return json->set(params[2], nJansson::PCU::ReadJsonHandle(params[3], pType, &sec));
+    nJansson::IJson* buffer = nullptr;
+    if(params[3] && (buffer = nJansson::PCU::ReadJsonHandle(params[3], pType, &sec)) == nullptr)
+        return 0;
+
+    return json->set(params[2], buffer);
 }
 
 cell_t JsonArraySetInt(IPluginContext *pContext, const cell_t *params) {
@@ -272,7 +276,11 @@ cell_t JsonArrayPushJson(IPluginContext *pContext, const cell_t *params) {
     if((json = nJansson::PCU::ReadJsonHandle(params[1], pType, &sec, IsArray)) == nullptr)
         return 0;
 
-    return json->push(nJansson::PCU::ReadJsonHandle(params[2], pType, &sec));
+    nJansson::IJson* buffer = nullptr;
+    if(params[2] && (buffer = nJansson::PCU::ReadJsonHandle(params[2], pType, &sec)) == nullptr)
+        return 0;
+
+    return json->push(buffer);
 }
 
 cell_t JsonArrayPushInt(IPluginContext *pContext, const cell_t *params) {

diff --git a/src/natives/json_o_natives.cpp b/src/natives/json_o_natives.cpp
@@ -197,7 +197,11 @@ cell_t JsonObjectSetJson(IPluginContext *pContext, const cell_t *params) {
     char* key;
     pContext->LocalToString(params[2], &key);
 
-    return json->set(key, nJansson::PCU::ReadJsonHandle(params[3], pType, &sec));
+    nJansson::IJson* buffer = nullptr;
+    if(params[3] && (buffer = nJansson::PCU::ReadJsonHandle(params[3], pType, &sec)) == nullptr)
+        return 0;
+
+    return json->set(key, buffer);
 }
 
 cell_t JsonObjectSetInt(IPluginContext *pContext, const cell_t *params) {