snmpstats: free allocated vars in case of error during init snmp tables

(cherry picked from commit 4d4c91a) (cherry picked from commit 7e8e7e5)
kamailio · Feb 22, 2018 · e4ceb1d · e4ceb1d
1 parent 0b75cd0
commit e4ceb1d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/src/modules/snmpstats/snmpSIPContactTable.c b/src/modules/snmpstats/snmpSIPContactTable.c
@@ -290,12 +290,17 @@ void initialize_table_kamailioSIPContactTable(void)
 
 	/** create the table structure itself */
 	table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
+	if(table_info==NULL) {
+		snmp_log(LOG_ERR, "failed to allocate table_info\n");
+		return;
+	}
 
 	my_handler = netsnmp_create_handler_registration("kamailioSIPContactTable",
 			netsnmp_table_array_helper_handler, kamailioSIPContactTable_oid,
 			kamailioSIPContactTable_oid_len, HANDLER_CAN_RONLY);
 
-	if(!my_handler || !table_info) {
+	if(!my_handler) {
+		SNMP_FREE(table_info);
 		snmp_log(LOG_ERR, "malloc failed in initialize_table_kamailio"
 						  "SIPContactTable_handler\n");
 		return; /** mallocs failed */

diff --git a/src/modules/snmpstats/snmpSIPMethodSupportedTable.c b/src/modules/snmpstats/snmpSIPMethodSupportedTable.c
@@ -176,14 +176,19 @@ void initialize_table_kamailioSIPMethodSupportedTable(void)
 
 	/** create the table structure itself */
 	table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
+	if(table_info==NULL) {
+		snmp_log(LOG_ERR, "failed to allocate table_info\n");
+		return;
+	}
 
 	my_handler = netsnmp_create_handler_registration(
 			"kamailioSIPMethodSupportedTable",
 			netsnmp_table_array_helper_handler,
 			kamailioSIPMethodSupportedTable_oid,
 			kamailioSIPMethodSupportedTable_oid_len, HANDLER_CAN_RONLY);
 
-	if(!my_handler || !table_info) {
+	if(!my_handler) {
+		SNMP_FREE(table_info);
 		snmp_log(LOG_ERR, "malloc failed in initialize_table_kamailio"
 						  "SIPMethodSupportedTable_handler\n");
 		return;

diff --git a/src/modules/snmpstats/snmpSIPPortTable.c b/src/modules/snmpstats/snmpSIPPortTable.c
@@ -307,12 +307,17 @@ void initialize_table_kamailioSIPPortTable(void)
 
 	/* create the table structure itself */
 	table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
+	if(table_info==NULL) {
+		snmp_log(LOG_ERR, "failed to allocate table_info\n");
+		return;
+	}
 
 	my_handler = netsnmp_create_handler_registration("kamailioSIPPortTable",
 			netsnmp_table_array_helper_handler, kamailioSIPPortTable_oid,
 			kamailioSIPPortTable_oid_len, HANDLER_CAN_RONLY);
 
-	if(!my_handler || !table_info) {
+	if(!my_handler) {
+		SNMP_FREE(table_info);
 		snmp_log(LOG_ERR, "malloc failed in "
 						  "initialize_table_kamailioSIPPortTable_handler\n");
 		return; /** mallocs failed */

diff --git a/src/modules/snmpstats/snmpSIPRegUserLookupTable.c b/src/modules/snmpstats/snmpSIPRegUserLookupTable.c
@@ -653,13 +653,18 @@ void initialize_table_kamailioSIPRegUserLookupTable(void)
 
 	/** create the table structure itself */
 	table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
+	if(table_info==NULL) {
+		snmp_log(LOG_ERR, "failed to allocate table_info\n");
+		return;
+	}
 
 	my_handler = netsnmp_create_handler_registration(
 			"kamailioSIPRegUserLookupTable", netsnmp_table_array_helper_handler,
 			kamailioSIPRegUserLookupTable_oid,
 			kamailioSIPRegUserLookupTable_oid_len, HANDLER_CAN_RWRITE);
 
-	if(!my_handler || !table_info) {
+	if(!my_handler) {
+		SNMP_FREE(table_info);
 		snmp_log(LOG_ERR, "malloc failed in "
 						  "initialize_table_kamailioSIPRegUserLookup"
 						  "Table_handler\n");

diff --git a/src/modules/snmpstats/snmpSIPRegUserTable.c b/src/modules/snmpstats/snmpSIPRegUserTable.c
@@ -297,12 +297,17 @@ void initialize_table_kamailioSIPRegUserTable(void)
 
 	/* create the table structure itself */
 	table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
+	if(table_info==NULL) {
+		snmp_log(LOG_ERR, "failed to allocate table_info\n");
+		return;
+	}
 
 	my_handler = netsnmp_create_handler_registration("kamailioSIPRegUserTable",
 			netsnmp_table_array_helper_handler, kamailioSIPRegUserTable_oid,
 			kamailioSIPRegUserTable_oid_len, HANDLER_CAN_RONLY);
 
-	if(!my_handler || !table_info) {
+	if(!my_handler) {
+		SNMP_FREE(table_info);
 		snmp_log(LOG_ERR, "malloc failed in initialize_table_kamailio"
 						  "SIPRegUserTable_handler\n");
 		return; /** mallocs failed */