Skip to content

Commit cb6356e

Browse files
committed
Merged pull request xdebug#1000
2 parents 6ef869c + 7279321 commit cb6356e

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

src/lib/var.c

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -431,19 +431,21 @@ static void fetch_zval_from_symbol_table(
431431
zend_op_array *opa = xdebug_lib_get_active_func_oparray();
432432
zval **CV;
433433

434-
while (opa->vars && i < opa->last_var) {
435-
if (ZSTR_H(opa->vars[i]) == hash_value &&
436-
ZSTR_LEN(opa->vars[i]) == element_length &&
437-
strncmp(STR_NAME_VAL(opa->vars[i]), element, element_length) == 0)
438-
{
439-
zval *CV_z = ZEND_CALL_VAR_NUM(xdebug_lib_get_active_data(), i);
440-
CV = &CV_z;
441-
if (CV) {
442-
ZVAL_COPY(&tmp_retval, *CV);
443-
goto cleanup;
434+
if (ZEND_USER_CODE(opa->type)) {
435+
while (opa->vars && i < opa->last_var) {
436+
if (ZSTR_H(opa->vars[i]) == hash_value &&
437+
ZSTR_LEN(opa->vars[i]) == element_length &&
438+
strncmp(STR_NAME_VAL(opa->vars[i]), element, element_length) == 0)
439+
{
440+
zval *CV_z = ZEND_CALL_VAR_NUM(xdebug_lib_get_active_data(), i);
441+
CV = &CV_z;
442+
if (CV) {
443+
ZVAL_COPY(&tmp_retval, *CV);
444+
goto cleanup;
445+
}
444446
}
447+
i++;
445448
}
446-
i++;
447449
}
448450
}
449451
free(element);

0 commit comments

Comments
 (0)