Skip to content

Commit b324050

Browse files
author
Boris Lytochkin
committed
Fix bug #61981
1 parent 5de1b08 commit b324050

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

ext/snmp/snmp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -832,9 +832,9 @@ static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS, int st,
832832
}
833833
} else if (st & SNMP_USE_SUFFIX_AS_KEYS && st & SNMP_CMD_WALK) {
834834
snprint_objid(buf2, sizeof(buf2), vars->name, vars->name_length);
835-
if (objid_query->vars[0].name_length <= vars->name_length && snmp_oid_compare(objid_query->vars[0].name, objid_query->vars[0].name_length, vars->name, objid_query->vars[0].name_length) == 0) {
835+
if (rootlen <= vars->name_length && snmp_oid_compare(root, rootlen, vars->name, rootlen) == 0) {
836836
buf2[0] = '\0';
837-
count = objid_query->vars[0].name_length;
837+
count = rootlen;
838838
while(count < vars->name_length){
839839
sprintf(buf, "%lu.", vars->name[count]);
840840
strcat(buf2, buf);

ext/snmp/tests/snmp-object.phpt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,19 @@ var_dump(gettype($z));
8383
var_dump(count($z));
8484
var_dump(key($z));
8585
var_dump(array_shift($z));
86+
var_dump(key($z));
87+
array_shift($z);
88+
var_dump(key($z));
89+
array_shift($z);
90+
var_dump(key($z));
91+
array_shift($z);
92+
var_dump(key($z));
93+
array_shift($z);
94+
var_dump(key($z));
95+
array_shift($z);
96+
var_dump(key($z));
97+
array_shift($z);
98+
var_dump(key($z));
8699
var_dump($session->close());
87100

88101
echo "SNMPv3 (default security settings)\n";
@@ -194,6 +207,13 @@ string(5) "array"
194207
int(%d)
195208
string(3) "1.0"
196209
string(%d) "%s"
210+
string(3) "2.0"
211+
string(3) "3.0"
212+
string(3) "4.0"
213+
string(3) "5.0"
214+
string(3) "6.0"
215+
string(3) "7.0"
216+
string(3) "8.0"
197217
bool(true)
198218
SNMPv3 (default security settings)
199219
string(%d) "%S"

0 commit comments

Comments
 (0)