a

Author: devnexen

ext/snmp/snmp.c

@@ -630,12 +630,13 @@ static void php_snmp_zend_string_release_from_char_pointer(char *ptr) {
 	zend_string_release((zend_string*) (ptr - XtOffsetOf(zend_string, val)));
 }
 
-static void php_free_objid_query(struct objid_query *objid_query, zend_string* oid_str, int st) {
-	if (oid_str && (st & SNMP_CMD_SET)) {
-		php_snmp_zend_string_release_from_char_pointer(objid_query->vars[0].value);
-	} else {
+static void php_free_objid_query(struct objid_query *objid_query, zend_string* oid_str, zend_string *type_str, int st) {
+	if (!oid_str) {
 		for (int i = 0; i < objid_query->count; i ++) {
 			snmpobjarg *arg = &objid_query->vars[i];
+			if ((st & SNMP_CMD_SET) && !type_str) {
+				php_snmp_zend_string_release_from_char_pointer(&arg->type);
+			}
 			php_snmp_zend_string_release_from_char_pointer(arg->oid);
 		}
 	}
@@ -784,14 +785,14 @@ static bool php_snmp_parse_oid(
 	if (st & SNMP_CMD_WALK) {
 		if (objid_query->count > 1) {
 			php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Multi OID walks are not supported!");
-			php_free_objid_query(objid_query, oid_str, st);
+			php_free_objid_query(objid_query, oid_str, type_str, st);
 			return false;
 		}
 		objid_query->vars[0].name_length = MAX_NAME_LEN;
 		if (strlen(objid_query->vars[0].oid)) { /* on a walk, an empty string means top of tree - no error */
 			if (!snmp_parse_oid(objid_query->vars[0].oid, objid_query->vars[0].name, &(objid_query->vars[0].name_length))) {
 				php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Invalid object identifier: %s", objid_query->vars[0].oid);
-				php_free_objid_query(objid_query, oid_str, st);
+				php_free_objid_query(objid_query, oid_str, type_str, st);
 				return false;
 			}
 		} else {
@@ -803,7 +804,7 @@ static bool php_snmp_parse_oid(
 			objid_query->vars[objid_query->offset].name_length = MAX_OID_LEN;
 			if (!snmp_parse_oid(objid_query->vars[objid_query->offset].oid, objid_query->vars[objid_query->offset].name, &(objid_query->vars[objid_query->offset].name_length))) {
 				php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Invalid object identifier: %s", objid_query->vars[objid_query->offset].oid);
-				php_free_objid_query(objid_query, oid_str, st);
+				php_free_objid_query(objid_query, oid_str, type_str, st);
 				return false;
 			}
 		}
@@ -1280,12 +1281,12 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version)
 
 	if (session_less_mode) {
 		if (!netsnmp_session_init(&session, version, a1, a2, timeout, retries)) {
-			php_free_objid_query(&objid_query, oid_str, st);
+			php_free_objid_query(&objid_query, oid_str, type_str, st);
 			netsnmp_session_free(&session);
 			RETURN_FALSE;
 		}
 		if (version == SNMP_VERSION_3 && !netsnmp_session_set_security(session, a3, a4, a5, a6, a7, NULL, NULL)) {
-			php_free_objid_query(&objid_query, oid_str, st);
+			php_free_objid_query(&objid_query, oid_str, type_str, st);
 			netsnmp_session_free(&session);
 			/* Warning message sent already, just bail out */
 			RETURN_FALSE;
@@ -1296,7 +1297,7 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version)
 		session = snmp_object->session;
 		if (!session) {
 			zend_throw_error(NULL, "Invalid or uninitialized SNMP object");
-			php_free_objid_query(&objid_query, oid_str, st);
+			php_free_objid_query(&objid_query, oid_str, type_str, st);
 			RETURN_THROWS();
 		}
 
@@ -1330,7 +1331,7 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version)
 		netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, glob_snmp_object.oid_output_format);
 	}
 
-	php_free_objid_query(&objid_query, oid_str, st);
+	php_free_objid_query(&objid_query, oid_str, type_str, st);
 }
 /* }}} */