agent: row merges: avoided potential null dereferences

Signed-off-by: Maxim Korotkov <[email protected]>
ProjectMutilation · Dec 20, 2023 · abb648a · abb648a
1 parent 80a1742
commit abb648a
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/agent/helpers/row_merge.c b/agent/helpers/row_merge.c
@@ -211,6 +211,10 @@ netsnmp_row_merge_helper_handler(netsnmp_mib_handler *handler,
      */
     rm_status = netsnmp_row_merge_status_get(reginfo, reqinfo, 1);
 
+    if (!rm_status) {
+        return SNMP_ERR_GENERR;
+    }
+
     /*
      * Count the requests, and set up an array to keep
      *  track of the original order.
@@ -273,6 +277,13 @@ netsnmp_row_merge_helper_handler(netsnmp_mib_handler *handler,
         rm_status->saved_status = calloc(count, sizeof(char));
     }
 
+    if (!rm_status->saved_requests || !rm_status->saved_status) {
+        free(rm_status->saved_requests);
+        free(rm_status->saved_status);
+        free(rm_status);
+        return SNMP_ERR_GENERR;
+    }
+
     saved_status = rm_status->saved_status;
     saved_requests = rm_status->saved_requests;