Skip to content

Commit 2c46d83

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

File tree

2 files changed

+75
-21
lines changed

2 files changed

+75
-21
lines changed

‎ext/snmp/snmp.c

Lines changed: 55 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,31 @@ 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+
if (ptr) {
631+
zend_string *pptr = (zend_string *)(ptr - XtOffsetOf(zend_string, val));
632+
zend_string_release(pptr);
633+
}
634+
}
635+
636+
static void php_free_objid_query(struct objid_query *objid_query, HashTable* oid_ht, const zend_string *value_str, const HashTable *value_ht, int st) {
637+
if (oid_ht) {
638+
uint32_t count = zend_hash_num_elements(oid_ht);
639+
640+
for (uint32_t i = 0; i < count; i ++) {
641+
snmpobjarg *arg = &objid_query->vars[i];
642+
if (!arg->oid) {
643+
break;
644+
}
645+
if (value_ht && !value_str) {
646+
php_snmp_zend_string_release_from_char_pointer(arg->value);
647+
}
648+
php_snmp_zend_string_release_from_char_pointer(arg->oid);
649+
}
650+
}
651+
efree(objid_query->vars);
652+
}
653+
629654
/* {{{ php_snmp_parse_oid
630655
*
631656
* OID parser (and type, value for SNMP_SET command)
@@ -674,15 +699,15 @@ static bool php_snmp_parse_oid(
674699
return false;
675700
}
676701
objid_query->vars = (snmpobjarg *)safe_emalloc(sizeof(snmpobjarg), zend_hash_num_elements(oid_ht), 0);
702+
memset(objid_query->vars, 0, sizeof(snmpobjarg) * zend_hash_num_elements(oid_ht));
677703
objid_query->array_output = (st & SNMP_CMD_SET) == 0;
678704
ZEND_HASH_FOREACH_VAL(oid_ht, tmp_oid) {
679705
zend_string *tmp = zval_try_get_string(tmp_oid);
680706
if (!tmp) {
681-
efree(objid_query->vars);
707+
php_free_objid_query(objid_query, oid_ht, value_str, value_ht, st);
682708
return false;
683709
}
684710
objid_query->vars[objid_query->count].oid = ZSTR_VAL(tmp);
685-
zend_string_release(tmp);
686711
if (st & SNMP_CMD_SET) {
687712
if (type_str) {
688713
pptr = ZSTR_VAL(type_str);
@@ -706,18 +731,24 @@ static bool php_snmp_parse_oid(
706731
}
707732
}
708733
if (idx_type < type_ht->nNumUsed) {
709-
convert_to_string(tmp_type);
710-
if (Z_STRLEN_P(tmp_type) != 1) {
734+
zend_string *type = zval_try_get_string(tmp_type);
735+
if (!type) {
736+
php_free_objid_query(objid_query, oid_ht, value_str, value_ht, st);
737+
return false;
738+
}
739+
size_t len = ZSTR_LEN(type);
740+
char ptype = *ZSTR_VAL(type);
741+
zend_string_release(type);
742+
if (len != 1) {
711743
zend_value_error("Type must be a single character");
712-
efree(objid_query->vars);
744+
php_free_objid_query(objid_query, oid_ht, value_str, value_ht, st);
713745
return false;
714746
}
715-
pptr = Z_STRVAL_P(tmp_type);
716-
objid_query->vars[objid_query->count].type = *pptr;
747+
objid_query->vars[objid_query->count].type = ptype;
717748
idx_type++;
718749
} else {
719-
php_error_docref(NULL, E_WARNING, "'%s': no type set", Z_STRVAL_P(tmp_oid));
720-
efree(objid_query->vars);
750+
php_error_docref(NULL, E_WARNING, "'%s': no type set", ZSTR_VAL(tmp));
751+
php_free_objid_query(objid_query, oid_ht, value_str, value_ht, st);
721752
return false;
722753
}
723754
}
@@ -743,12 +774,16 @@ static bool php_snmp_parse_oid(
743774
}
744775
}
745776
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);
777+
zend_string *tmp = zval_try_get_string(tmp_value);
778+
if (!tmp) {
779+
php_free_objid_query(objid_query, oid_ht, value_str, value_ht, st);
780+
return false;
781+
}
782+
objid_query->vars[objid_query->count].value = ZSTR_VAL(tmp);
748783
idx_value++;
749784
} else {
750-
php_error_docref(NULL, E_WARNING, "'%s': no value set", Z_STRVAL_P(tmp_oid));
751-
efree(objid_query->vars);
785+
php_error_docref(NULL, E_WARNING, "'%s': no value set", ZSTR_VAL(tmp));
786+
php_free_objid_query(objid_query, oid_ht, value_str, value_ht, st);
752787
return false;
753788
}
754789
}
@@ -761,14 +796,14 @@ static bool php_snmp_parse_oid(
761796
if (st & SNMP_CMD_WALK) {
762797
if (objid_query->count > 1) {
763798
php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Multi OID walks are not supported!");
764-
efree(objid_query->vars);
799+
php_free_objid_query(objid_query, oid_ht, value_str, value_ht, st);
765800
return false;
766801
}
767802
objid_query->vars[0].name_length = MAX_NAME_LEN;
768803
if (strlen(objid_query->vars[0].oid)) { /* on a walk, an empty string means top of tree - no error */
769804
if (!snmp_parse_oid(objid_query->vars[0].oid, objid_query->vars[0].name, &(objid_query->vars[0].name_length))) {
770805
php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Invalid object identifier: %s", objid_query->vars[0].oid);
771-
efree(objid_query->vars);
806+
php_free_objid_query(objid_query, oid_ht, value_str, value_ht, st);
772807
return false;
773808
}
774809
} else {
@@ -780,7 +815,7 @@ static bool php_snmp_parse_oid(
780815
objid_query->vars[objid_query->offset].name_length = MAX_OID_LEN;
781816
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))) {
782817
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);
818+
php_free_objid_query(objid_query, oid_ht, value_str, value_ht, st);
784819
return false;
785820
}
786821
}
@@ -1257,12 +1292,12 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version)
12571292

12581293
if (session_less_mode) {
12591294
if (!netsnmp_session_init(&session, version, a1, a2, timeout, retries)) {
1260-
efree(objid_query.vars);
1295+
php_free_objid_query(&objid_query, oid_ht, value_str, value_ht, st);
12611296
netsnmp_session_free(&session);
12621297
RETURN_FALSE;
12631298
}
12641299
if (version == SNMP_VERSION_3 && !netsnmp_session_set_security(session, a3, a4, a5, a6, a7, NULL, NULL)) {
1265-
efree(objid_query.vars);
1300+
php_free_objid_query(&objid_query, oid_ht, value_str, value_ht, st);
12661301
netsnmp_session_free(&session);
12671302
/* Warning message sent already, just bail out */
12681303
RETURN_FALSE;
@@ -1273,7 +1308,7 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version)
12731308
session = snmp_object->session;
12741309
if (!session) {
12751310
zend_throw_error(NULL, "Invalid or uninitialized SNMP object");
1276-
efree(objid_query.vars);
1311+
php_free_objid_query(&objid_query, oid_ht, value_str, value_ht, st);
12771312
RETURN_THROWS();
12781313
}
12791314

@@ -1299,7 +1334,7 @@ static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version)
12991334

13001335
php_snmp_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, st, session, &objid_query);
13011336

1302-
efree(objid_query.vars);
1337+
php_free_objid_query(&objid_query, oid_ht, value_str, value_ht, st);
13031338

13041339
if (session_less_mode) {
13051340
netsnmp_session_free(&session);

‎ext/snmp/tests/gh16959.phpt

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,22 @@ var_dump(snmpget($hostname, "", $bad_object_ids) === false);
1919
var_dump($bad_object_ids);
2020
try {
2121
snmpget($hostname, "", [0 => new stdClass()]);
22+
} catch (Throwable $e) {
23+
echo $e->getMessage() . PHP_EOL;
24+
}
25+
26+
try {
27+
snmp2_set($hostname, $communityWrite, $bad_object_ids, array(new stdClass()), array(null));
28+
} catch (Throwable $e) {
29+
echo $e->getMessage() . PHP_EOL;
30+
}
31+
try {
32+
snmp2_set($hostname, $communityWrite, $bad_object_ids, array("toolongtype"), array(null));
33+
} catch (Throwable $e) {
34+
echo $e->getMessage() . PHP_EOL;
35+
}
36+
try {
37+
snmp2_set($hostname, $communityWrite, $bad_object_ids, array(str_repeat("onetoomuch", random_int(1, 1))), array(null));
2238
} catch (Throwable $e) {
2339
echo $e->getMessage();
2440
}
@@ -35,7 +51,7 @@ array(4) {
3551
int(0)
3652
}
3753

38-
Warning: snmpget(): Invalid object identifier: -229 in %s on line %d
54+
Warning: snmpget(): Invalid object identifier: -54 in %s on line %d
3955
bool(true)
4056
array(4) {
4157
[63]=>
@@ -48,3 +64,6 @@ array(4) {
4864
int(0)
4965
}
5066
Object of class stdClass could not be converted to string
67+
Object of class stdClass could not be converted to string
68+
Type must be a single character
69+
Type must be a single character

0 commit comments

Comments
 (0)