Skip to content

Fix for PHP 7.3 - Array/Object recursion protection #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
remicollet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for PHP 7.3 - Array/Object recursion protection #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions lua.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,13 +430,23 @@ int php_lua_send_zval_to_lua(lua_State *L, zval *val) /* {{{ */ {
zval zkey;

HashTable *ht = HASH_OF(val);
#if PHP_VERSION_ID < 70300
if (ZEND_HASH_APPLY_PROTECTION(ht)) {
ZEND_HASH_INC_APPLY_COUNT(ht);
if (ZEND_HASH_GET_APPLY_COUNT(ht) > 1) {
php_error_docref(NULL, E_ERROR, "recursion found");
ZEND_HASH_DEC_APPLY_COUNT(ht);
break;
}
#else
if (!(GC_FLAGS(ht) & GC_IMMUTABLE)) {
if (GC_IS_RECURSIVE(ht)) {
php_error_docref(NULL, E_ERROR, "recursion found");
break;
} else {
GC_PROTECT_RECURSION(ht);
}
#endif
}

lua_newtable(L);
Expand All @@ -452,8 +462,13 @@ int php_lua_send_zval_to_lua(lua_State *L, zval *val) /* {{{ */ {
lua_settable(L, -3);
} ZEND_HASH_FOREACH_END();

#if PHP_VERSION_ID < 70300
if (ZEND_HASH_APPLY_PROTECTION(ht)) {
ZEND_HASH_DEC_APPLY_COUNT(ht);
#else
if (!(GC_FLAGS(ht) & GC_IMMUTABLE)) {
GC_UNPROTECT_RECURSION(ht);
#endif
}
}
}
Expand Down