Skip to content

Commit e2691d8

Browse files
devnexendevnexen
committed
try out @nielsdos suggestion, delaying free object_id at the end of the call.
1 parent fc4ef43 commit e2691d8

File tree

2 files changed

+46
-18
lines changed

2 files changed

+46
-18
lines changed

‎ext/snmp/snmp.c

Lines changed: 45 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,26 @@ static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS, int st,
626626
}
627627
/* }}} */
628628

629+
static void php_snmp_zend_string_release_from_char_pointer(char *ptr) {
630+
zend_string *pptr = (zend_string *)(ptr - XtOffsetOf(zend_string, val));
631+
zend_string_release(pptr);
632+
}
633+
634+
static void php_free_objid_query(struct objid_query *objid_query, zend_string* oid_str, zend_string *value_str, HashTable *value_ht, int st) {
635+
if (!oid_str) {
636+
for (int i = 0; i < objid_query->count; i ++) {
637+
snmpobjarg *arg = &objid_query->vars[i];
638+
if (st & SNMP_CMD_SET) {
639+
if (!value_str && value_ht) {
640+
php_snmp_zend_string_release_from_char_pointer(arg->value);
641+
}
642+
}
643+
php_snmp_zend_string_release_from_char_pointer(arg->oid);
644+
}
645+
}
646+
efree(objid_query->vars);
647+
}
648+
629649
/* {{{ php_snmp_parse_oid
630650
*
631651
* OID parser (and type, value for SNMP_SET command)
@@ -682,7 +702,6 @@ static bool php_snmp_parse_oid(
682702
return false;
683703
}
684704
objid_query->vars[objid_query->count].oid = ZSTR_VAL(tmp);
685-
zend_string_release(tmp);
686705
if (st & SNMP_CMD_SET) {
687706
if (type_str) {
688707
pptr = ZSTR_VAL(type_str);
@@ -706,18 +725,23 @@ static bool php_snmp_parse_oid(
706725
}
707726
}
708727
if (idx_type < type_ht->nNumUsed) {
709-
convert_to_string(tmp_type);
710-
if (Z_STRLEN_P(tmp_type) != 1) {
728+
zval new;
729+
ZVAL_COPY_VALUE(&new, tmp_type);
730+
if (!try_convert_to_string(&new)) {
731+
php_free_objid_query(objid_query, oid_str, value_str, value_ht, st);
732+
return false;
733+
}
734+
if (Z_STRLEN(new) != 1) {
711735
zend_value_error("Type must be a single character");
712-
efree(objid_query->vars);
736+
php_free_objid_query(objid_query, oid_str, value_str, value_ht, st);
713737
return false;
714738
}
715-
pptr = Z_STRVAL_P(tmp_type);
739+
pptr = Z_STRVAL(new);
716740
objid_query->vars[objid_query->count].type = *pptr;
717741
idx_type++;
718742
} else {
719743
php_error_docref(NULL, E_WARNING, "'%s': no type set", Z_STRVAL_P(tmp_oid));
720-
efree(objid_query->vars);
744+
php_free_objid_query(objid_query, oid_str, value_str, value_ht, st);
721745
return false;
722746
}
723747
}
@@ -743,12 +767,16 @@ static bool php_snmp_parse_oid(
743767
}
744768
}
745769
if (idx_value < value_ht->nNumUsed) {
746-
convert_to_string(tmp_value);
747-
objid_query->vars[objid_query->count].value = Z_STRVAL_P(tmp_value);
770+
zend_string *tmp = zval_try_get_string(tmp_value);
771+
if (!tmp) {
772+
php_free_objid_query(objid_query, oid_str, value_str, value_ht, st);
773+
return false;
774+
}
775+
objid_query->vars[objid_query->count].value = ZSTR_VAL(tmp);
748776
idx_value++;
749777
} else {
750778
php_error_docref(NULL, E_WARNING, "'%s': no value set", Z_STRVAL_P(tmp_oid));
751-
efree(objid_query->vars);
779+
php_free_objid_query(objid_query, oid_str, value_str, value_ht, st);
752780
return false;
753781
}
754782
}
@@ -761,14 +789,14 @@ static bool php_snmp_parse_oid(
761789
if (st & SNMP_CMD_WALK) {
762790
if (objid_query->count > 1) {
763791
php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Multi OID walks are not supported!");
764-
efree(objid_query->vars);
792+
php_free_objid_query(objid_query, oid_str, value_str, value_ht, st);
765793
return false;
766794
}
767795
objid_query->vars[0].name_length = MAX_NAME_LEN;
768796
if (strlen(objid_query->vars[0].oid)) { /* on a walk, an empty string means top of tree - no error */
769797
if (!snmp_parse_oid(objid_query->vars[0].oid, objid_query->vars[0].name, &(objid_query->vars[0].name_length))) {
770798
php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Invalid object identifier: %s", objid_query->vars[0].oid);
771-
efree(objid_query->vars);
799+
php_free_objid_query(objid_query, oid_str, value_str, value_ht, st);
772800
return false;
773801
}
774802
} else {
@@ -780,7 +808,7 @@ static bool php_snmp_parse_oid(
780808
objid_query->vars[objid_query->offset].name_length = MAX_OID_LEN;
781809
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))) {
782810
php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Invalid object identifier: %s", objid_query->vars[objid_query->offset].oid);
783-
efree(objid_query->vars);
811+
php_free_objid_query(objid_query, oid_str, value_str, value_ht, st);
784812
return false;
785813
}
786814
}
@@ -1257,12 +1285,12 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version)
12571285

12581286
if (session_less_mode) {
12591287
if (!netsnmp_session_init(&session, version, a1, a2, timeout, retries)) {
1260-
efree(objid_query.vars);
1288+
php_free_objid_query(&objid_query, oid_str, value_str, value_ht, st);
12611289
netsnmp_session_free(&session);
12621290
RETURN_FALSE;
12631291
}
12641292
if (version == SNMP_VERSION_3 && !netsnmp_session_set_security(session, a3, a4, a5, a6, a7, NULL, NULL)) {
1265-
efree(objid_query.vars);
1293+
php_free_objid_query(&objid_query, oid_str, value_str, value_ht, st);
12661294
netsnmp_session_free(&session);
12671295
/* Warning message sent already, just bail out */
12681296
RETURN_FALSE;
@@ -1273,7 +1301,7 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version)
12731301
session = snmp_object->session;
12741302
if (!session) {
12751303
zend_throw_error(NULL, "Invalid or uninitialized SNMP object");
1276-
efree(objid_query.vars);
1304+
php_free_objid_query(&objid_query, oid_str, value_str, value_ht, st);
12771305
RETURN_THROWS();
12781306
}
12791307

@@ -1299,15 +1327,15 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version)
12991327

13001328
php_snmp_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, st, session, &objid_query);
13011329

1302-
efree(objid_query.vars);
1303-
13041330
if (session_less_mode) {
13051331
netsnmp_session_free(&session);
13061332
} else {
13071333
netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM, glob_snmp_object.enum_print);
13081334
netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT, glob_snmp_object.quick_print);
13091335
netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, glob_snmp_object.oid_output_format);
13101336
}
1337+
1338+
php_free_objid_query(&objid_query, oid_str, value_str, value_ht, st);
13111339
}
13121340
/* }}} */
13131341

‎ext/snmp/tests/gh16959.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ array(4) {
3535
int(0)
3636
}
3737

38-
Warning: snmpget(): Invalid object identifier: -229 in %s on line %d
38+
Warning: snmpget(): Invalid object identifier: -54 in %s on line %d
3939
bool(true)
4040
array(4) {
4141
[63]=>

0 commit comments

Comments
 (0)