mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2025-03-14 19:07:01 +00:00
Code Releases Activity

No !(GC_FLAGS(tmp_ht) & GC_IMMUTABLE) for < PHP 7.3

Browse Source
This commit is contained in:
Jan-E 2018-07-04 22:28:16 +02:00
parent 6d7ea7cbf2
commit 52ef0266d1
2 changed files with 16 additions and 0 deletions

8
v8js_convert.cc

@ -85,7 +85,11 @@ static v8::Local<v8::Value> v8js_hash_to_jsarr(zval *value, v8::Isolate *isolate
zval *data; zval *data;
ulong index = 0; ulong index = 0;
#if PHP_VERSION_ID >= 70300
if (myht && !(GC_FLAGS(myht) & GC_IMMUTABLE)) { if (myht && !(GC_FLAGS(myht) & GC_IMMUTABLE)) {
#else
if (myht) {
#endif
GC_PROTECT_RECURSION(myht); GC_PROTECT_RECURSION(myht);
} }
@ -93,7 +97,11 @@ static v8::Local<v8::Value> v8js_hash_to_jsarr(zval *value, v8::Isolate *isolate
newarr->Set(index++, zval_to_v8js(data, isolate)); newarr->Set(index++, zval_to_v8js(data, isolate));
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
#if PHP_VERSION_ID >= 70300
if (myht && !(GC_FLAGS(myht) & GC_IMMUTABLE)) { if (myht && !(GC_FLAGS(myht) & GC_IMMUTABLE)) {
#else
if (myht) {
#endif
GC_UNPROTECT_RECURSION(myht); GC_UNPROTECT_RECURSION(myht);
} }
} }

8
v8js_object_export.cc

@ -956,7 +956,11 @@ static v8::Local<v8::Object> v8js_wrap_array_to_object(v8::Isolate *isolate, zva
{ {
zval *data; zval *data;
#if PHP_VERSION_ID >= 70300
if (myht && !(GC_FLAGS(myht) & GC_IMMUTABLE)) { if (myht && !(GC_FLAGS(myht) & GC_IMMUTABLE)) {
#else
if (myht) {
#endif
GC_PROTECT_RECURSION(myht); GC_PROTECT_RECURSION(myht);
} }
@ -988,7 +992,11 @@ static v8::Local<v8::Object> v8js_wrap_array_to_object(v8::Isolate *isolate, zva
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
#if PHP_VERSION_ID >= 70300
if (myht && !(GC_FLAGS(myht) & GC_IMMUTABLE)) { if (myht && !(GC_FLAGS(myht) & GC_IMMUTABLE)) {
#else
if (myht) {
#endif
GC_UNPROTECT_RECURSION(myht); GC_UNPROTECT_RECURSION(myht);
} }