php-win-ext/php-lua
1
0
Fork 0
mirror of https://github.com/php-win-ext/php-lua.git synced 2026-03-24 00:52:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed hash recursive detecting

Browse Source
This commit is contained in:
Xinchen Hui
2018-12-21 11:09:57 +08:00
parent ad31d5f7c6
commit f588c88528
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config.m4
View File

@@ -1,4 +1,3 @@
dnl $Id: config.m4 321796 2012-01-05 17:23:48Z laruence $
PHP_ARG_WITH(lua, for lua support, PHP_ARG_WITH(lua, for lua support,
[ --with-lua=[DIR] Include php lua support]) [ --with-lua=[DIR] Include php lua support])
PHP_ARG_WITH(lua-version, to specify a custom lua version, [ --with-lua-version=[VERSION]] Use the specified lua version.) PHP_ARG_WITH(lua-version, to specify a custom lua version, [ --with-lua-version=[VERSION]] Use the specified lua version.)

36
lua.c
View File

@@ -430,13 +430,29 @@ try_again:
zval zkey; zval zkey;
HashTable *ht = HASH_OF(val); HashTable *ht = HASH_OF(val);
if (ZEND_HASH_APPLY_PROTECTION(ht)) { if (
ZEND_HASH_INC_APPLY_COUNT(ht); #if PHP_VERSION_ID < 70300
if (ZEND_HASH_GET_APPLY_COUNT(ht) > 1) { ZEND_HASH_APPLY_PROTECTION(ht)
#else
!(GC_FLAGS(ht) & GC_IMMUTABLE)
#endif
) {
if (
#if PHP_VERSION_ID < 70300
ZEND_HASH_GET_APPLY_COUNT(ht)
#else
GC_IS_RECURSIVE(ht)
#endif
) {
php_error_docref(NULL, E_ERROR, "recursion found"); php_error_docref(NULL, E_ERROR, "recursion found");
ZEND_HASH_DEC_APPLY_COUNT(ht);
break; break;
} }
#if PHP_VERSION_ID < 70300
ZEND_HASH_INC_APPLY_COUNT(ht);
#else
GC_PROTECT_RECURSION(ht);
#endif
} }
lua_newtable(L); lua_newtable(L);
@@ -452,8 +468,18 @@ try_again:
lua_settable(L, -3); lua_settable(L, -3);
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
if (ZEND_HASH_APPLY_PROTECTION(ht)) { if (
#if PHP_VERSION_ID < 70300
ZEND_HASH_APPLY_PROTECTION(ht)
#else
!(GC_FLAGS(ht) & GC_IMMUTABLE)
#endif
) {
#if PHP_VERSION_ID < 70300
ZEND_HASH_DEC_APPLY_COUNT(ht); ZEND_HASH_DEC_APPLY_COUNT(ht);
#else
GC_UNPROTECT_RECURSION(ht);
#endif
} }
} }
} }

2
php_lua.h
View File

@@ -48,7 +48,7 @@ extern zend_module_entry lua_module_entry;
#define LUA_G(v) (lua_globals.v) #define LUA_G(v) (lua_globals.v)
#endif #endif
#define PHP_LUA_VERSION "2.0.6-dev" #define PHP_LUA_VERSION "2.0.6"
struct _php_lua_object { struct _php_lua_object {
lua_State *L; lua_State *L;