diff options
Diffstat (limited to '48.patch')
| -rw-r--r-- | 48.patch | 119 |
1 files changed, 0 insertions, 119 deletions
diff --git a/48.patch b/48.patch deleted file mode 100644 index 5b8edf1..0000000 --- a/48.patch +++ /dev/null @@ -1,119 +0,0 @@ -From a6b22a380212ff2db890587669088d241d4e65bc Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 28 Jun 2018 08:46:45 +0200 -Subject: [PATCH] fix for PHP 7.3 and Array/Object recursion protection - ---- - .gitignore | 1 + - mustache_data.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 44 insertions(+) - -diff --git a/mustache_data.cpp b/mustache_data.cpp -index a73168c..c129eaa 100644 ---- a/mustache_data.cpp -+++ b/mustache_data.cpp -@@ -267,10 +267,19 @@ static zend_always_inline void mustache_data_from_array_zval(mustache::Data * no - - data_hash = HASH_OF(current); - -+#if PHP_VERSION_ID < 70300 - if( ZEND_HASH_APPLY_PROTECTION(data_hash) && ++data_hash->u.v.nApplyCount > 1 ) { - php_error(E_WARNING, "Data includes circular reference"); - data_hash->u.v.nApplyCount--; - return; -+#else -+ if (!(GC_FLAGS(data_hash) & GC_IMMUTABLE)) { -+ if (GC_IS_RECURSIVE(data_hash)) { -+ php_error(E_WARNING, "Data includes circular reference"); -+ return; -+ } -+ GC_PROTECT_RECURSION(data_hash); -+#endif - } - - data_count = zend_hash_num_elements(data_hash); -@@ -309,8 +318,13 @@ static zend_always_inline void mustache_data_from_array_zval(mustache::Data * no - } - } ZEND_HASH_FOREACH_END(); - -+#if PHP_VERSION_ID < 70300 - if( ZEND_HASH_APPLY_PROTECTION(data_hash) ) { - data_hash->u.v.nApplyCount--; -+#else -+ if (!(GC_FLAGS(data_hash) & GC_IMMUTABLE)) { -+ GC_UNPROTECT_RECURSION(data_hash); -+#endif - } - } - #endif -@@ -417,12 +431,22 @@ static zend_always_inline void mustache_data_from_object_properties_zval(mustach - data_hash = Z_OBJ_HT_P(current)->get_properties(current TSRMLS_CC); - } - if( data_hash != NULL && zend_hash_num_elements(data_hash) > 0 ) { -+#if PHP_VERSION_ID < 70300 - if( ZEND_HASH_APPLY_PROTECTION(data_hash) && ++data_hash->u.v.nApplyCount > 1 ) { - php_error(E_WARNING, "Data includes circular reference"); - data_hash->u.v.nApplyCount--; - return; -+#else -+ if (!(GC_FLAGS(data_hash) & GC_IMMUTABLE)) { -+ if (GC_IS_RECURSIVE(data_hash)) { -+ php_error(E_WARNING, "Data includes circular reference"); -+ return; -+ } -+ GC_PROTECT_RECURSION(data_hash); -+#endif - } - -+ - ZEND_HASH_FOREACH_KEY_VAL_IND(data_hash, key_nindex, key, data_entry) { - (void)key_nindex; /* avoid [-Wunused-but-set-variable] */ - if( key && ZSTR_LEN(key) && ZSTR_VAL(key)[0] ) { // skip private/protected -@@ -451,8 +475,13 @@ static zend_always_inline void mustache_data_from_object_properties_zval(mustach - } - } ZEND_HASH_FOREACH_END(); - -+#if PHP_VERSION_ID < 70300 - if( ZEND_HASH_APPLY_PROTECTION(data_hash) ) { - data_hash->u.v.nApplyCount--; -+#else -+ if (!(GC_FLAGS(data_hash) & GC_IMMUTABLE)) { -+ GC_UNPROTECT_RECURSION(data_hash); -+#endif - } - } - } -@@ -519,10 +548,19 @@ static zend_always_inline void mustache_data_from_object_functions_zval(mustache - data_hash = &ce->function_table; - } - if( data_hash != NULL && zend_hash_num_elements(data_hash) > 0 ) { -+#if PHP_VERSION_ID < 70300 - if( ZEND_HASH_APPLY_PROTECTION(data_hash) && ++data_hash->u.v.nApplyCount > 1 ) { - php_error(E_WARNING, "Data includes circular reference"); - data_hash->u.v.nApplyCount--; - return; -+#else -+ if (!(GC_FLAGS(data_hash) & GC_IMMUTABLE)) { -+ if (GC_IS_RECURSIVE(data_hash)) { -+ php_error(E_WARNING, "Data includes circular reference"); -+ return; -+ } -+ GC_PROTECT_RECURSION(data_hash); -+#endif - } - - ZEND_HASH_FOREACH_KEY_VAL_IND(data_hash, key_nindex, key, data_entry) { -@@ -542,8 +580,13 @@ static zend_always_inline void mustache_data_from_object_functions_zval(mustache - } - } ZEND_HASH_FOREACH_END(); - -+#if PHP_VERSION_ID < 70300 - if( ZEND_HASH_APPLY_PROTECTION(data_hash) ) { - data_hash->u.v.nApplyCount--; -+#else -+ if (!(GC_FLAGS(data_hash) & GC_IMMUTABLE)) { -+ GC_UNPROTECT_RECURSION(data_hash); -+#endif - } - } - } |