com php-src: Implement delayed __wakeup: ext/standard/v ar_unserializer.c ext/standard/var_unserializer.re

From: Date: Wed, 04 Jan 2017 23:21:48 +0000
Subject: com php-src: Implement delayed __wakeup: ext/standard/v ar_unserializer.c ext/standard/var_unserializer.re
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-96555@lists.php.net to get a copy of this message
Commit: 0426b916df396a23e5c34514e4f2f0627efdcdf0 Author: Nikita Popov <nikic@php.net> Thu, 5 Jan 2017 00:19:26 +0100 Parents: fa2125df6766bb7edac0a0bf433940465da9af4b Branches: PHP-5.6 PHP-7.0 PHP-7.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0426b916df396a23e5c34514e4f2f0627efdcdf0 Log: Implement delayed __wakeup Changed paths: M ext/standard/var_unserializer.c M ext/standard/var_unserializer.re

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 79d98e5..6706866 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.7.5 */ +/* Generated by re2c 0.16 */ #line 1 "ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ @@ -28,6 +28,11 @@ #define VAR_ENTRIES_MAX 1024 #define VAR_ENTRIES_DBG 0 +#define VAR_WAKEUP_FLAG 1 +#define WITH_WAKEUP_FLAG(zv_ptr) ((zval *) ((zend_uintptr_t) zv_ptr | VAR_WAKEUP_FLAG)) +#define WITHOUT_WAKEUP_FLAG(zv_ptr) ((zval *) ((zend_uintptr_t) zv_ptr & ~VAR_WAKEUP_FLAG)) +#define HAS_WAKEUP_FLAG(zv_ptr) ((zend_uintptr_t) zv_ptr & VAR_WAKEUP_FLAG) + typedef struct { zval *data[VAR_ENTRIES_MAX]; long used_slots; @@ -58,12 +63,12 @@ static inline void var_push(php_unserialize_data_t *var_hashx, zval **rval) var_hash->data[var_hash->used_slots++] = *rval; } -PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) +static inline zval **get_var_push_dtor_slot(php_unserialize_data_t *var_hashx) { var_entries *var_hash; if (!var_hashx || !*var_hashx) { - return; + return NULL; } var_hash = (*var_hashx)->last_dtor; @@ -85,8 +90,14 @@ PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) (*var_hashx)->last_dtor = var_hash; } + return &var_hash->data[var_hash->used_slots++]; +} + +PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) +{ + zval **slot = get_var_push_dtor_slot(var_hashx); Z_ADDREF_PP(rval); - var_hash->data[var_hash->used_slots++] = *rval; + *slot = *rval; } PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval **rval) @@ -164,6 +175,9 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) void *next; long i; var_entries *var_hash = (*var_hashx)->first; + zend_bool wakeup_failed = 0; + TSRMLS_FETCH(); + #if VAR_ENTRIES_DBG fprintf(stderr, "var_destroy(%ld)\n", var_hash?var_hash->used_slots:-1L); #endif @@ -178,10 +192,35 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) while (var_hash) { for (i = 0; i < var_hash->used_slots; i++) { + zval *zv = var_hash->data[i]; #if VAR_ENTRIES_DBG fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_hash->data[i], Z_REFCOUNT_P(var_hash->data[i])); #endif - zval_ptr_dtor(&var_hash->data[i]); + + if (HAS_WAKEUP_FLAG(zv)) { + zv = WITHOUT_WAKEUP_FLAG(zv); + if (!wakeup_failed) { + zval *retval_ptr = NULL; + zval wakeup_name; + INIT_PZVAL(&wakeup_name); + ZVAL_STRINGL(&wakeup_name, "__wakeup", sizeof("__wakeup") - 1, 0); + + BG(serialize_lock)++; + if (call_user_function_ex(CG(function_table), &zv, &wakeup_name, &retval_ptr, 0, 0, 1, NULL TSRMLS_CC) == FAILURE || retval_ptr == NULL) { + wakeup_failed = 1; + zend_object_store_ctor_failed(zv TSRMLS_CC); + } + BG(serialize_lock)--; + + if (retval_ptr) { + zval_ptr_dtor(&retval_ptr); + } + } else { + zend_object_store_ctor_failed(zv TSRMLS_CC); + } + } + + zval_ptr_dtor(&zv); } next = var_hash->next; efree(var_hash); @@ -241,7 +280,7 @@ static char *unserialize_str(const unsigned char **p, size_t *len, size_t maxlen #define YYMARKER marker -#line 249 "ext/standard/var_unserializer.re" +#line 288 "ext/standard/var_unserializer.re" @@ -431,19 +470,16 @@ static inline long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce) #endif static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) { - zval *retval_ptr = NULL; - zval fname; - if (Z_TYPE_PP(rval) != IS_OBJECT) { return 0; } if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements, 1)) { - /* We've got partially constructed object on our hands here. Wipe it. */ - if(Z_TYPE_PP(rval) == IS_OBJECT) { - zend_hash_clean(Z_OBJPROP_PP(rval)); - zend_object_store_ctor_failed(*rval TSRMLS_CC); - } + /* We've got partially constructed object on our hands here. Wipe it. */ + if (Z_TYPE_PP(rval) == IS_OBJECT) { + zend_hash_clean(Z_OBJPROP_PP(rval)); + zend_object_store_ctor_failed(*rval TSRMLS_CC); + } ZVAL_NULL(*rval); return 0; } @@ -453,20 +489,16 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) } if (Z_OBJCE_PP(rval) != PHP_IC_ENTRY && - zend_hash_exists(&Z_OBJCE_PP(rval)->function_table, "__wakeup", sizeof("__wakeup"))) { - INIT_PZVAL(&fname); - ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1, 0); - BG(serialize_lock)++; - call_user_function_ex(CG(function_table), rval, &fname, &retval_ptr, 0, 0, 1, NULL TSRMLS_CC); - BG(serialize_lock)--; - } - - if (retval_ptr) { - zval_ptr_dtor(&retval_ptr); - } - - if (EG(exception)) { - return 0; + zend_hash_exists(&Z_OBJCE_PP(rval)->function_table, "__wakeup", sizeof("__wakeup")) + ) { + /* Store object for delayed __wakeup call. Remove references. */ + zval **slot = get_var_push_dtor_slot(var_hash); + zval *zv = *rval; + Z_ADDREF_P(zv); + if (PZVAL_IS_REF(zv)) { + SEPARATE_ZVAL(&zv); + } + *slot = WITH_WAKEUP_FLAG(zv); } return finish_nested_data(UNSERIALIZE_PASSTHRU); @@ -497,7 +529,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) -#line 501 "ext/standard/var_unserializer.c" +#line 533 "ext/standard/var_unserializer.c" { YYCTYPE yych; static const unsigned char yybm[] = { @@ -534,544 +566,411 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7); yych = *YYCURSOR; switch (yych) { case 'C': - case 'O': goto yy13; + case 'O': goto yy4; case 'N': goto yy5; - case 'R': goto yy2; - case 'S': goto yy10; - case 'a': goto yy11; - case 'b': goto yy6; - case 'd': goto yy8; - case 'i': goto yy7; + case 'R': goto yy6; + case 'S': goto yy7; + case 'a': goto yy8; + case 'b': goto yy9; + case 'd': goto yy10; + case 'i': goto yy11; case 'o': goto yy12; - case 'r': goto yy4; - case 's': goto yy9; - case '}': goto yy14; - default: goto yy16; + case 'r': goto yy13; + case 's': goto yy14; + case '}': goto yy15; + default: goto yy2; } yy2: - yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy95; + ++YYCURSOR; yy3: -#line 877 "ext/standard/var_unserializer.re" +#line 909 "ext/standard/var_unserializer.re" { return 0; } -#line 563 "ext/standard/var_unserializer.c" +#line 593 "ext/standard/var_unserializer.c" yy4: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy89; + if (yych == ':') goto yy17; goto yy3; yy5: yych = *++YYCURSOR; - if (yych == ';') goto yy87; + if (yych == ';') goto yy19; goto yy3; yy6: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy83; + if (yych == ':') goto yy21; goto yy3; yy7: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy77; + if (yych == ':') goto yy22; goto yy3; yy8: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy53; + if (yych == ':') goto yy23; goto yy3; yy9: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy46; + if (yych == ':') goto yy24; goto yy3; yy10: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy39; + if (yych == ':') goto yy25; goto yy3; yy11: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy32; + if (yych == ':') goto yy26; goto yy3; yy12: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy25; + if (yych == ':') goto yy27; goto yy3; yy13: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy17; + if (yych == ':') goto yy28; goto yy3; yy14: + yych = *(YYMARKER = ++YYCURSOR); + if (yych == ':') goto yy29; + goto yy3; +yy15: ++YYCURSOR; -#line 871 "ext/standard/var_unserializer.re" +#line 903 "ext/standard/var_unserializer.re" { /* this is the case where we have less data than planned */ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data"); return 0; /* not sure if it should be 0 or 1 here? */ } -#line 612 "ext/standard/var_unserializer.c" -yy16: - yych = *++YYCURSOR; - goto yy3; +#line 646 "ext/standard/var_unserializer.c" yy17: yych = *++YYCURSOR; if (yybm[0+yych] & 128) { - goto yy20; + goto yy31; } - if (yych == '+') goto yy19; + if (yych == '+') goto yy30; yy18: YYCURSOR = YYMARKER; goto yy3; yy19: + ++YYCURSOR; +#line 581 "ext/standard/var_unserializer.re" + { + *p = YYCURSOR; + INIT_PZVAL(*rval); + ZVAL_NULL(*rval); + return 1; +} +#line 665 "ext/standard/var_unserializer.c" +yy21: yych = *++YYCURSOR; - if (yybm[0+yych] & 128) { - goto yy20; + if (yych <= ',') { + if (yych == '+') goto yy33; + goto yy18; + } else { + if (yych <= '-') goto yy33; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy34; + goto yy18; } +yy22: + yych = *++YYCURSOR; + if (yych == '+') goto yy36; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy37; goto yy18; -yy20: - ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; - if (yybm[0+yych] & 128) { - goto yy20; - } +yy23: + yych = *++YYCURSOR; + if (yych == '+') goto yy39; if (yych <= '/') goto yy18; - if (yych >= ';') goto yy18; + if (yych <= '9') goto yy40; + goto yy18; +yy24: yych = *++YYCURSOR; - if (yych != '"') goto yy18; - ++YYCURSOR; -#line 717 "ext/standard/var_unserializer.re" - { - size_t len, len2, len3, maxlen; - long elements; - char *class_name; - zend_class_entry *ce; - zend_class_entry **pce; - int incomplete_class = 0; - - int custom_object = 0; - - zval *user_func; - zval *retval_ptr; - zval **args[1]; - zval *arg_func_name; - - if (!var_hash) return 0; - if (*start == 'C') { - custom_object = 1; - } - - INIT_PZVAL(*rval); - len2 = len = parse_uiv(start + 2); - maxlen = max - YYCURSOR; - if (maxlen < len || len == 0) { - *p = start + 2; - return 0; - } - - class_name = (char*)YYCURSOR; - - YYCURSOR += len; - - if (*(YYCURSOR) != '"') { - *p = YYCURSOR; - return 0; - } - if (*(YYCURSOR+1) != ':') { - *p = YYCURSOR+1; - return 0; - } - - len3 = strspn(class_name, "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377\\"); - if (len3 != len) - { - *p = YYCURSOR + len3 - len; - return 0; - } - - class_name = estrndup(class_name, len); - - do { - /* Try to find class directly */ - BG(serialize_lock)++; - if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) { - BG(serialize_lock)--; - if (EG(exception)) { - efree(class_name); - return 0; - } - ce = *pce; - break; - } - BG(serialize_lock)--; - - if (EG(exception)) { - efree(class_name); - return 0; - } - - /* Check for unserialize callback */ - if ((PG(unserialize_callback_func) == NULL) || (PG(unserialize_callback_func)[0] == '\0')) { - incomplete_class = 1; - ce = PHP_IC_ENTRY; - break; - } - - /* Call unserialize callback */ - MAKE_STD_ZVAL(user_func); - ZVAL_STRING(user_func, PG(unserialize_callback_func), 1); - args[0] = &arg_func_name; - MAKE_STD_ZVAL(arg_func_name); - ZVAL_STRING(arg_func_name, class_name, 1); - BG(serialize_lock)++; - if (call_user_function_ex(CG(function_table), NULL, user_func, &retval_ptr, 1, args, 0, NULL TSRMLS_CC) != SUCCESS) { - BG(serialize_lock)--; - if (EG(exception)) { - efree(class_name); - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&arg_func_name); - return 0; - } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "defined (%s) but not found", user_func->value.str.val); - incomplete_class = 1; - ce = PHP_IC_ENTRY; - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&arg_func_name); - break; - } - BG(serialize_lock)--; - if (retval_ptr) { - zval_ptr_dtor(&retval_ptr); - } - if (EG(exception)) { - efree(class_name); - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&arg_func_name); - return 0; - } - - /* The callback function may have defined the class */ - BG(serialize_lock)++; - if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) { - ce = *pce; + if (yych <= '/') goto yy18; + if (yych <= '1') goto yy42; + goto yy18; +yy25: + yych = *++YYCURSOR; + if (yych <= '/') { + if (yych <= ',') { + if (yych == '+') goto yy43; + goto yy18; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function %s() hasn't defined the class it was called for", user_func->value.str.val); - incomplete_class = 1; - ce = PHP_IC_ENTRY; + if (yych <= '-') goto yy44; + if (yych <= '.') goto yy45; + goto yy18; } - BG(serialize_lock)--; - - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&arg_func_name); - break; - } while (1); - - *p = YYCURSOR; - - if (custom_object) { - int ret; - - ret = object_custom(UNSERIALIZE_PASSTHRU, ce); - - if (ret && incomplete_class) { - php_store_class_name(*rval, class_name, len2); + } else { + if (yych <= 'I') { + if (yych <= '9') goto yy46; + if (yych <= 'H') goto yy18; + goto yy48; + } else { + if (yych == 'N') goto yy49; + goto yy18; } - efree(class_name); - return ret; } - - elements = object_common1(UNSERIALIZE_PASSTHRU, ce); - - if (elements < 0) { - efree(class_name); - return 0; +yy26: + yych = *++YYCURSOR; + if (yych <= ',') { + if (yych == '+') goto yy50; + goto yy18; + } else { + if (yych <= '-') goto yy50; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy51; + goto yy18; } - - if (incomplete_class) { - php_store_class_name(*rval, class_name, len2); +yy27: + yych = *++YYCURSOR; + if (yych <= ',') { + if (yych == '+') goto yy53; + goto yy18; + } else { + if (yych <= '-') goto yy53; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy54; + goto yy18; } - efree(class_name); - - return object_common2(UNSERIALIZE_PASSTHRU, elements); -} -#line 797 "ext/standard/var_unserializer.c" -yy25: +yy28: yych = *++YYCURSOR; if (yych <= ',') { - if (yych != '+') goto yy18; + if (yych == '+') goto yy56; + goto yy18; } else { - if (yych <= '-') goto yy26; + if (yych <= '-') goto yy56; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy27; + if (yych <= '9') goto yy57; goto yy18; } -yy26: +yy29: yych = *++YYCURSOR; + if (yych == '+') goto yy59; if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; -yy27: + if (yych <= '9') goto yy60; + goto yy18; +yy30: + yych = *++YYCURSOR; + if (yybm[0+yych] & 128) { + goto yy31; + } + goto yy18; +yy31: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; + if (yybm[0+yych] & 128) { + goto yy31; + } if (yych <= '/') goto yy18; - if (yych <= '9') goto yy27; - if (yych >= ';') goto yy18; + if (yych <= ':') goto yy62; + goto yy18; +yy33: yych = *++YYCURSOR; - if (yych != '"') goto yy18; + if (yych <= '/') goto yy18; + if (yych >= ':') goto yy18; +yy34: ++YYCURSOR; -#line 704 "ext/standard/var_unserializer.re" - { - long elements; - if (!var_hash) return 0; - - INIT_PZVAL(*rval); - - elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR); - if (elements < 0) { - return 0; - } - return object_common2(UNSERIALIZE_PASSTHRU, elements); -} -#line 835 "ext/standard/var_unserializer.c" -yy32: - yych = *++YYCURSOR; - if (yych == '+') goto yy33; + if (YYLIMIT <= YYCURSOR) YYFILL(1); + yych = *YYCURSOR; if (yych <= '/') goto yy18; if (yych <= '9') goto yy34; + if (yych == ';') goto yy63; goto yy18; -yy33: +yy36: yych = *++YYCURSOR; if (yych <= '/') goto yy18; if (yych >= ':') goto yy18; -yy34: +yy37: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy34; - if (yych >= ';') goto yy18; + if (yych <= '9') goto yy37; + if (yych <= ':') goto yy65; + goto yy18; +yy39: yych = *++YYCURSOR; - if (yych != '{') goto yy18; + if (yych <= '/') goto yy18; + if (yych >= ':') goto yy18; +yy40: ++YYCURSOR; -#line 683 "ext/standard/var_unserializer.re" - { - long elements = parse_iv(start + 2); - /* use iv() not uiv() in order to check data range */ - *p = YYCURSOR; - if (!var_hash) return 0; - - if (elements < 0) { - return 0; + if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy40; + if (yych <= ':') goto yy66; + goto yy18; +yy42: + yych = *++YYCURSOR; + if (yych == ';') goto yy67; + goto yy18; +yy43: + yych = *++YYCURSOR; + if (yych == '.') goto yy45; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy46; + goto yy18; +yy44: + yych = *++YYCURSOR; + if (yych <= '/') { + if (yych != '.') goto yy18; + } else { + if (yych <= '9') goto yy46; + if (yych == 'I') goto yy48; + goto yy18; } - - INIT_PZVAL(*rval); - - array_init_size(*rval, elements); - - if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements, 0)) { - return 0; +yy45: + yych = *++YYCURSOR; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy69; + goto yy18; +yy46: + ++YYCURSOR; + if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); + yych = *YYCURSOR; + if (yych <= ':') { + if (yych <= '.') { + if (yych <= '-') goto yy18; + goto yy69; + } else { + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy46; + goto yy18; + } + } else { + if (yych <= 'E') { + if (yych <= ';') goto yy71; + if (yych <= 'D') goto yy18; + goto yy73; + } else { + if (yych == 'e') goto yy73; + goto yy18; + } } - - return finish_nested_data(UNSERIALIZE_PASSTHRU); -} -#line 877 "ext/standard/var_unserializer.c" -yy39: +yy48: + yych = *++YYCURSOR; + if (yych == 'N') goto yy74; + goto yy18; +yy49: yych = *++YYCURSOR; - if (yych == '+') goto yy40; + if (yych == 'A') goto yy75; + goto yy18; +yy50: + yych = *++YYCURSOR; + if (yych <= '/') goto yy18; + if (yych >= ':') goto yy18; +yy51: + ++YYCURSOR; + if (YYLIMIT <= YYCURSOR) YYFILL(1); + yych = *YYCURSOR; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy41; + if (yych <= '9') goto yy51; + if (yych == ';') goto yy76; goto yy18; -yy40: +yy53: yych = *++YYCURSOR; if (yych <= '/') goto yy18; if (yych >= ':') goto yy18; -yy41: +yy54: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy41; - if (yych >= ';') goto yy18; + if (yych <= '9') goto yy54; + if (yych <= ':') goto yy78; + goto yy18; +yy56: yych = *++YYCURSOR; - if (yych != '"') goto yy18; + if (yych <= '/') goto yy18; + if (yych >= ':') goto yy18; +yy57: ++YYCURSOR; -#line 648 "ext/standard/var_unserializer.re" - { - size_t len, maxlen; - char *str; - - len = parse_uiv(start + 2); - maxlen = max - YYCURSOR; - if (maxlen < len) { - *p = start + 2; - return 0; - } - - if ((str = unserialize_str(&YYCURSOR, &len, maxlen)) == NULL) { - return 0; - } - - if (*(YYCURSOR) != '"') { - efree(str); - *p = YYCURSOR; - return 0; - } - - if (*(YYCURSOR + 1) != ';') { - efree(str); - *p = YYCURSOR + 1; - return 0; - } - - YYCURSOR += 2; - *p = YYCURSOR; - - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 0); - return 1; -} -#line 933 "ext/standard/var_unserializer.c" -yy46: - yych = *++YYCURSOR; - if (yych == '+') goto yy47; + if (YYLIMIT <= YYCURSOR) YYFILL(1); + yych = *YYCURSOR; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy48; + if (yych <= '9') goto yy57; + if (yych == ';') goto yy79; goto yy18; -yy47: +yy59: yych = *++YYCURSOR; if (yych <= '/') goto yy18; if (yych >= ':') goto yy18; -yy48: +yy60: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy48; - if (yych >= ';') goto yy18; + if (yych <= '9') goto yy60; + if (yych <= ':') goto yy81; + goto yy18; +yy62: yych = *++YYCURSOR; - if (yych != '"') goto yy18; + if (yych == '"') goto yy82; + goto yy18; +yy63: ++YYCURSOR; -#line 615 "ext/standard/var_unserializer.re" +#line 537 "ext/standard/var_unserializer.re" { - size_t len, maxlen; - char *str; - - len = parse_uiv(start + 2); - maxlen = max - YYCURSOR; - if (maxlen < len) { - *p = start + 2; - return 0; - } - - str = (char*)YYCURSOR; + long id; - YYCURSOR += len; + *p = YYCURSOR; + if (!var_hash) return 0; - if (*(YYCURSOR) != '"') { - *p = YYCURSOR; + id = parse_iv(start + 2) - 1; + if (id == -1 || var_access(var_hash, id, &rval_ref) != SUCCESS) { return 0; } - if (*(YYCURSOR + 1) != ';') { - *p = YYCURSOR + 1; - return 0; + if (*rval != NULL) { + var_push_dtor_no_addref(var_hash, rval); } + *rval = *rval_ref; + Z_ADDREF_PP(rval); + Z_SET_ISREF_PP(rval); - YYCURSOR += 2; - *p = YYCURSOR; - - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 1); return 1; } -#line 987 "ext/standard/var_unserializer.c" -yy53: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych <= ',') { - if (yych == '+') goto yy57; - goto yy18; - } else { - if (yych <= '-') goto yy55; - if (yych <= '.') goto yy60; - goto yy18; - } - } else { - if (yych <= 'I') { - if (yych <= '9') goto yy58; - if (yych <= 'H') goto yy18; - goto yy56; - } else { - if (yych != 'N') goto yy18; - } - } +#line 936 "ext/standard/var_unserializer.c" +yy65: yych = *++YYCURSOR; - if (yych == 'A') goto yy76; + if (yych == '"') goto yy84; goto yy18; -yy55: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy60; - goto yy18; - } else { - if (yych <= '9') goto yy58; - if (yych != 'I') goto yy18; - } -yy56: +yy66: yych = *++YYCURSOR; - if (yych == 'N') goto yy72; + if (yych == '{') goto yy86; goto yy18; -yy57: - yych = *++YYCURSOR; - if (yych == '.') goto yy60; - if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; -yy58: +yy67: ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); - yych = *YYCURSOR; - if (yych <= ':') { - if (yych <= '.') { - if (yych <= '-') goto yy18; - goto yy70; - } else { - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy58; - goto yy18; - } - } else { - if (yych <= 'E') { - if (yych <= ';') goto yy63; - if (yych <= 'D') goto yy18; - goto yy65; - } else { - if (yych == 'e') goto yy65; - goto yy18; - } - } -yy60: - yych = *++YYCURSOR; - if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; -yy61: +#line 588 "ext/standard/var_unserializer.re" + { + *p = YYCURSOR; + INIT_PZVAL(*rval); + ZVAL_BOOL(*rval, parse_iv(start + 2)); + return 1; +} +#line 954 "ext/standard/var_unserializer.c" +yy69: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; if (yych <= ';') { if (yych <= '/') goto yy18; - if (yych <= '9') goto yy61; + if (yych <= '9') goto yy69; if (yych <= ':') goto yy18; } else { if (yych <= 'E') { if (yych <= 'D') goto yy18; - goto yy65; + goto yy73; } else { - if (yych == 'e') goto yy65; + if (yych == 'e') goto yy73; goto yy18; } } -yy63: +yy71: ++YYCURSOR; -#line 605 "ext/standard/var_unserializer.re" +#line 637 "ext/standard/var_unserializer.re" { #if SIZEOF_LONG == 4 use_double: @@ -1081,111 +980,32 @@ use_double: ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL)); return 1; } -#line 1085 "ext/standard/var_unserializer.c" -yy65: +#line 984 "ext/standard/var_unserializer.c" +yy73: yych = *++YYCURSOR; if (yych <= ',') { - if (yych != '+') goto yy18; + if (yych == '+') goto yy88; + goto yy18; } else { - if (yych <= '-') goto yy66; + if (yych <= '-') goto yy88; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy67; + if (yych <= '9') goto yy89; goto yy18; } -yy66: +yy74: yych = *++YYCURSOR; - if (yych <= ',') { - if (yych == '+') goto yy69; - goto yy18; - } else { - if (yych <= '-') goto yy69; - if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; - } -yy67: - ++YYCURSOR; - if (YYLIMIT <= YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy67; - if (yych == ';') goto yy63; + if (yych == 'F') goto yy91; goto yy18; -yy69: +yy75: yych = *++YYCURSOR; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy67; + if (yych == 'N') goto yy91; goto yy18; -yy70: - ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); - yych = *YYCURSOR; - if (yych <= ';') { - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy70; - if (yych <= ':') goto yy18; - goto yy63; - } else { - if (yych <= 'E') { - if (yych <= 'D') goto yy18; - goto yy65; - } else { - if (yych == 'e') goto yy65; - goto yy18; - } - } -yy72: - yych = *++YYCURSOR; - if (yych != 'F') goto yy18; -yy73: - yych = *++YYCURSOR; - if (yych != ';') goto yy18; +yy76: ++YYCURSOR; -#line 590 "ext/standard/var_unserializer.re" +#line 595 "ext/standard/var_unserializer.re" { - *p = YYCURSOR; - INIT_PZVAL(*rval); - - if (!strncmp(start + 2, "NAN", 3)) { - ZVAL_DOUBLE(*rval, php_get_nan()); - } else if (!strncmp(start + 2, "INF", 3)) { - ZVAL_DOUBLE(*rval, php_get_inf()); - } else if (!strncmp(start + 2, "-INF", 4)) { - ZVAL_DOUBLE(*rval, -php_get_inf()); - } - - return 1; -} -#line 1159 "ext/standard/var_unserializer.c" -yy76: - yych = *++YYCURSOR; - if (yych == 'N') goto yy73; - goto yy18; -yy77: - yych = *++YYCURSOR; - if (yych <= ',') { - if (yych != '+') goto yy18; - } else { - if (yych <= '-') goto yy78; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy79; - goto yy18; - } -yy78: - yych = *++YYCURSOR; - if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; -yy79: - ++YYCURSOR; - if (YYLIMIT <= YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy79; - if (yych != ';') goto yy18; - ++YYCURSOR; -#line 563 "ext/standard/var_unserializer.re" - { -#if SIZEOF_LONG == 4 - int digits = YYCURSOR - start - 3; +#if SIZEOF_LONG == 4 + int digits = YYCURSOR - start - 3; if (start[2] == '-' || start[2] == '+') { digits--; @@ -1209,55 +1029,14 @@ yy79: ZVAL_LONG(*rval, parse_iv(start + 2)); return 1; } -#line 1213 "ext/standard/var_unserializer.c" -yy83: - yych = *++YYCURSOR; - if (yych <= '/') goto yy18; - if (yych >= '2') goto yy18; - yych = *++YYCURSOR; - if (yych != ';') goto yy18; - ++YYCURSOR; -#line 556 "ext/standard/var_unserializer.re" - { - *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_BOOL(*rval, parse_iv(start + 2)); - return 1; -} -#line 1228 "ext/standard/var_unserializer.c" -yy87: - ++YYCURSOR; -#line 549 "ext/standard/var_unserializer.re" - { - *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_NULL(*rval); - return 1; -} -#line 1238 "ext/standard/var_unserializer.c" -yy89: - yych = *++YYCURSOR; - if (yych <= ',') { - if (yych != '+') goto yy18; - } else { - if (yych <= '-') goto yy90; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy91; - goto yy18; - } -yy90: +#line 1033 "ext/standard/var_unserializer.c" +yy78: yych = *++YYCURSOR; - if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; -yy91: - ++YYCURSOR; - if (YYLIMIT <= YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if (yych <= '/') goto yy18; - if (yych <= '9') goto yy91; - if (yych != ';') goto yy18; + if (yych == '"') goto yy92; + goto yy18; +yy79: ++YYCURSOR; -#line 526 "ext/standard/var_unserializer.re" +#line 558 "ext/standard/var_unserializer.re" { long id; @@ -1280,53 +1059,329 @@ yy91: return 1; } -#line 1284 "ext/standard/var_unserializer.c" -yy95: +#line 1063 "ext/standard/var_unserializer.c" +yy81: + yych = *++YYCURSOR; + if (yych == '"') goto yy94; + goto yy18; +yy82: + ++YYCURSOR; +#line 749 "ext/standard/var_unserializer.re" + { + size_t len, len2, len3, maxlen; + long elements; + char *class_name; + zend_class_entry *ce; + zend_class_entry **pce; + int incomplete_class = 0; + + int custom_object = 0; + + zval *user_func; + zval *retval_ptr; + zval **args[1]; + zval *arg_func_name; + + if (!var_hash) return 0; + if (*start == 'C') { + custom_object = 1; + } + + INIT_PZVAL(*rval); + len2 = len = parse_uiv(start + 2); + maxlen = max - YYCURSOR; + if (maxlen < len || len == 0) { + *p = start + 2; + return 0; + } + + class_name = (char*)YYCURSOR; + + YYCURSOR += len; + + if (*(YYCURSOR) != '"') { + *p = YYCURSOR; + return 0; + } + if (*(YYCURSOR+1) != ':') { + *p = YYCURSOR+1; + return 0; + } + + len3 = strspn(class_name, "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377\\"); + if (len3 != len) + { + *p = YYCURSOR + len3 - len; + return 0; + } + + class_name = estrndup(class_name, len); + + do { + /* Try to find class directly */ + BG(serialize_lock)++; + if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) { + BG(serialize_lock)--; + if (EG(exception)) { + efree(class_name); + return 0; + } + ce = *pce; + break; + } + BG(serialize_lock)--; + + if (EG(exception)) { + efree(class_name); + return 0; + } + + /* Check for unserialize callback */ + if ((PG(unserialize_callback_func) == NULL) || (PG(unserialize_callback_func)[0] == '\0')) { + incomplete_class = 1; + ce = PHP_IC_ENTRY; + break; + } + + /* Call unserialize callback */ + MAKE_STD_ZVAL(user_func); + ZVAL_STRING(user_func, PG(unserialize_callback_func), 1); + args[0] = &arg_func_name; + MAKE_STD_ZVAL(arg_func_name); + ZVAL_STRING(arg_func_name, class_name, 1); + BG(serialize_lock)++; + if (call_user_function_ex(CG(function_table), NULL, user_func, &retval_ptr, 1, args, 0, NULL TSRMLS_CC) != SUCCESS) { + BG(serialize_lock)--; + if (EG(exception)) { + efree(class_name); + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&arg_func_name); + return 0; + } + php_error_docref(NULL TSRMLS_CC, E_WARNING, "defined (%s) but not found", user_func->value.str.val); + incomplete_class = 1; + ce = PHP_IC_ENTRY; + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&arg_func_name); + break; + } + BG(serialize_lock)--; + if (retval_ptr) { + zval_ptr_dtor(&retval_ptr); + } + if (EG(exception)) { + efree(class_name); + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&arg_func_name); + return 0; + } + + /* The callback function may have defined the class */ + BG(serialize_lock)++; + if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) { + ce = *pce; + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function %s() hasn't defined the class it was called for", user_func->value.str.val); + incomplete_class = 1; + ce = PHP_IC_ENTRY; + } + BG(serialize_lock)--; + + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&arg_func_name); + break; + } while (1); + + *p = YYCURSOR; + + if (custom_object) { + int ret; + + ret = object_custom(UNSERIALIZE_PASSTHRU, ce); + + if (ret && incomplete_class) { + php_store_class_name(*rval, class_name, len2); + } + efree(class_name); + return ret; + } + + elements = object_common1(UNSERIALIZE_PASSTHRU, ce); + + if (elements < 0) { + efree(class_name); + return 0; + } + + if (incomplete_class) { + php_store_class_name(*rval, class_name, len2); + } + efree(class_name); + + return object_common2(UNSERIALIZE_PASSTHRU, elements); +} +#line 1224 "ext/standard/var_unserializer.c" +yy84: + ++YYCURSOR; +#line 680 "ext/standard/var_unserializer.re" + { + size_t len, maxlen; + char *str; + + len = parse_uiv(start + 2); + maxlen = max - YYCURSOR; + if (maxlen < len) { + *p = start + 2; + return 0; + } + + if ((str = unserialize_str(&YYCURSOR, &len, maxlen)) == NULL) { + return 0; + } + + if (*(YYCURSOR) != '"') { + efree(str); + *p = YYCURSOR; + return 0; + } + + if (*(YYCURSOR + 1) != ';') { + efree(str); + *p = YYCURSOR + 1; + return 0; + } + + YYCURSOR += 2; + *p = YYCURSOR; + + INIT_PZVAL(*rval); + ZVAL_STRINGL(*rval, str, len, 0); + return 1; +} +#line 1262 "ext/standard/var_unserializer.c" +yy86: + ++YYCURSOR; +#line 715 "ext/standard/var_unserializer.re" + { + long elements = parse_iv(start + 2); + /* use iv() not uiv() in order to check data range */ + *p = YYCURSOR; + if (!var_hash) return 0; + + if (elements < 0) { + return 0; + } + + INIT_PZVAL(*rval); + + array_init_size(*rval, elements); + + if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements, 0)) { + return 0; + } + + return finish_nested_data(UNSERIALIZE_PASSTHRU); +} +#line 1286 "ext/standard/var_unserializer.c" +yy88: yych = *++YYCURSOR; if (yych <= ',') { - if (yych != '+') goto yy18; + if (yych == '+') goto yy96; + goto yy18; } else { if (yych <= '-') goto yy96; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy97; - goto yy18; + if (yych >= ':') goto yy18; } -yy96: - yych = *++YYCURSOR; - if (yych <= '/') goto yy18; - if (yych >= ':') goto yy18; -yy97: +yy89: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; if (yych <= '/') goto yy18; - if (yych <= '9') goto yy97; - if (yych != ';') goto yy18; + if (yych <= '9') goto yy89; + if (yych == ';') goto yy71; + goto yy18; +yy91: + yych = *++YYCURSOR; + if (yych == ';') goto yy97; + goto yy18; +yy92: ++YYCURSOR; -#line 505 "ext/standard/var_unserializer.re" +#line 736 "ext/standard/var_unserializer.re" { - long id; + long elements; + if (!var_hash) return 0; - *p = YYCURSOR; - if (!var_hash) return 0; + INIT_PZVAL(*rval); - id = parse_iv(start + 2) - 1; - if (id == -1 || var_access(var_hash, id, &rval_ref) != SUCCESS) { + elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR); + if (elements < 0) { return 0; } + return object_common2(UNSERIALIZE_PASSTHRU, elements); +} +#line 1324 "ext/standard/var_unserializer.c" +yy94: + ++YYCURSOR; +#line 647 "ext/standard/var_unserializer.re" + { + size_t len, maxlen; + char *str; - if (*rval != NULL) { - var_push_dtor_no_addref(var_hash, rval); + len = parse_uiv(start + 2); + maxlen = max - YYCURSOR; + if (maxlen < len) { + *p = start + 2; + return 0; + } + + str = (char*)YYCURSOR; + + YYCURSOR += len; + + if (*(YYCURSOR) != '"') { + *p = YYCURSOR; + return 0; + } + + if (*(YYCURSOR + 1) != ';') { + *p = YYCURSOR + 1; + return 0; + } + + YYCURSOR += 2; + *p = YYCURSOR; + + INIT_PZVAL(*rval); + ZVAL_STRINGL(*rval, str, len, 1); + return 1; +} +#line 1360 "ext/standard/var_unserializer.c" +yy96: + yych = *++YYCURSOR; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy89; + goto yy18; +yy97: + ++YYCURSOR; +#line 622 "ext/standard/var_unserializer.re" + { + *p = YYCURSOR; + INIT_PZVAL(*rval); + + if (!strncmp(start + 2, "NAN", 3)) { + ZVAL_DOUBLE(*rval, php_get_nan()); + } else if (!strncmp(start + 2, "INF", 3)) { + ZVAL_DOUBLE(*rval, php_get_inf()); + } else if (!strncmp(start + 2, "-INF", 4)) { + ZVAL_DOUBLE(*rval, -php_get_inf()); } - *rval = *rval_ref; - Z_ADDREF_PP(rval); - Z_SET_ISREF_PP(rval); return 1; } -#line 1328 "ext/standard/var_unserializer.c" +#line 1383 "ext/standard/var_unserializer.c" } -#line 879 "ext/standard/var_unserializer.re" +#line 911 "ext/standard/var_unserializer.re" return 0; diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 7fbab9f..bb0000b 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -26,6 +26,11 @@ #define VAR_ENTRIES_MAX 1024 #define VAR_ENTRIES_DBG 0 +#define VAR_WAKEUP_FLAG 1 +#define WITH_WAKEUP_FLAG(zv_ptr) ((zval *) ((zend_uintptr_t) zv_ptr | VAR_WAKEUP_FLAG)) +#define WITHOUT_WAKEUP_FLAG(zv_ptr) ((zval *) ((zend_uintptr_t) zv_ptr & ~VAR_WAKEUP_FLAG)) +#define HAS_WAKEUP_FLAG(zv_ptr) ((zend_uintptr_t) zv_ptr & VAR_WAKEUP_FLAG) + typedef struct { zval *data[VAR_ENTRIES_MAX]; long used_slots; @@ -56,12 +61,12 @@ static inline void var_push(php_unserialize_data_t *var_hashx, zval **rval) var_hash->data[var_hash->used_slots++] = *rval; } -PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) +static inline zval **get_var_push_dtor_slot(php_unserialize_data_t *var_hashx) { var_entries *var_hash; if (!var_hashx || !*var_hashx) { - return; + return NULL; } var_hash = (*var_hashx)->last_dtor; @@ -83,8 +88,14 @@ PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) (*var_hashx)->last_dtor = var_hash; } + return &var_hash->data[var_hash->used_slots++]; +} + +PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval) +{ + zval **slot = get_var_push_dtor_slot(var_hashx); Z_ADDREF_PP(rval); - var_hash->data[var_hash->used_slots++] = *rval; + *slot = *rval; } PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval **rval) @@ -162,6 +173,9 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) void *next; long i; var_entries *var_hash = (*var_hashx)->first; + zend_bool wakeup_failed = 0; + TSRMLS_FETCH(); + #if VAR_ENTRIES_DBG fprintf(stderr, "var_destroy(%ld)\n", var_hash?var_hash->used_slots:-1L); #endif @@ -176,10 +190,35 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) while (var_hash) { for (i = 0; i < var_hash->used_slots; i++) { + zval *zv = var_hash->data[i]; #if VAR_ENTRIES_DBG fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_hash->data[i], Z_REFCOUNT_P(var_hash->data[i])); #endif - zval_ptr_dtor(&var_hash->data[i]); + + if (HAS_WAKEUP_FLAG(zv)) { + zv = WITHOUT_WAKEUP_FLAG(zv); + if (!wakeup_failed) { + zval *retval_ptr = NULL; + zval wakeup_name; + INIT_PZVAL(&wakeup_name); + ZVAL_STRINGL(&wakeup_name, "__wakeup", sizeof("__wakeup") - 1, 0); + + BG(serialize_lock)++; + if (call_user_function_ex(CG(function_table), &zv, &wakeup_name, &retval_ptr, 0, 0, 1, NULL TSRMLS_CC) == FAILURE || retval_ptr == NULL) { + wakeup_failed = 1; + zend_object_store_ctor_failed(zv TSRMLS_CC); + } + BG(serialize_lock)--; + + if (retval_ptr) { + zval_ptr_dtor(&retval_ptr); + } + } else { + zend_object_store_ctor_failed(zv TSRMLS_CC); + } + } + + zval_ptr_dtor(&zv); } next = var_hash->next; efree(var_hash); @@ -435,19 +474,16 @@ static inline long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce) #endif static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) { - zval *retval_ptr = NULL; - zval fname; - if (Z_TYPE_PP(rval) != IS_OBJECT) { return 0; } if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements, 1)) { - /* We've got partially constructed object on our hands here. Wipe it. */ - if(Z_TYPE_PP(rval) == IS_OBJECT) { - zend_hash_clean(Z_OBJPROP_PP(rval)); - zend_object_store_ctor_failed(*rval TSRMLS_CC); - } + /* We've got partially constructed object on our hands here. Wipe it. */ + if (Z_TYPE_PP(rval) == IS_OBJECT) { + zend_hash_clean(Z_OBJPROP_PP(rval)); + zend_object_store_ctor_failed(*rval TSRMLS_CC); + } ZVAL_NULL(*rval); return 0; } @@ -457,20 +493,16 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) } if (Z_OBJCE_PP(rval) != PHP_IC_ENTRY && - zend_hash_exists(&Z_OBJCE_PP(rval)->function_table, "__wakeup", sizeof("__wakeup"))) { - INIT_PZVAL(&fname); - ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1, 0); - BG(serialize_lock)++; - call_user_function_ex(CG(function_table), rval, &fname, &retval_ptr, 0, 0, 1, NULL TSRMLS_CC); - BG(serialize_lock)--; - } - - if (retval_ptr) { - zval_ptr_dtor(&retval_ptr); - } - - if (EG(exception)) { - return 0; + zend_hash_exists(&Z_OBJCE_PP(rval)->function_table, "__wakeup", sizeof("__wakeup")) + ) { + /* Store object for delayed __wakeup call. Remove references. */ + zval **slot = get_var_push_dtor_slot(var_hash); + zval *zv = *rval; + Z_ADDREF_P(zv); + if (PZVAL_IS_REF(zv)) { + SEPARATE_ZVAL(&zv); + } + *slot = WITH_WAKEUP_FLAG(zv); } return finish_nested_data(UNSERIALIZE_PASSTHRU);
« previous php.cvs (#96555) next »