From: Nikita Popov Date: Wed, 4 Jan 2017 23:28:21 +0000 (+0100) Subject: Merge branch 'PHP-7.0' into PHP-7.1 X-Git-Tag: php-7.1.1RC1~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d8e94936959eb2466ec77d1e537427f92650363;p=php Merge branch 'PHP-7.0' into PHP-7.1 --- 8d8e94936959eb2466ec77d1e537427f92650363 diff --cc ext/standard/var_unserializer.c index 83b371972b,76688b93dd..15b01017a4 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@@ -139,6 -99,7 +142,7 @@@ PHPAPI zval *var_tmp_var(php_unserializ (*var_hashx)->last_dtor = var_hash; } ZVAL_UNDEF(&var_hash->data[var_hash->used_slots]); - Z_VAR_FLAGS(var_hash->data[var_hash->used_slots]) = 0; ++ Z_ACCESS_FLAGS(var_hash->data[var_hash->used_slots]) = 0; return &var_hash->data[var_hash->used_slots++]; } @@@ -201,7 -167,29 +210,29 @@@ PHPAPI void var_destroy(php_unserialize #if VAR_ENTRIES_DBG fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_dtor_hash->data[i], Z_REFCOUNT_P(var_dtor_hash->data[i])); #endif - zval_ptr_dtor(&var_dtor_hash->data[i]); + + /* Perform delayed __wakeup calls */ - if (Z_VAR_FLAGS_P(zv) == VAR_WAKEUP_FLAG) { ++ if (Z_ACCESS_FLAGS_P(zv) == VAR_WAKEUP_FLAG) { + if (!wakeup_failed) { + zval retval; + if (Z_ISUNDEF(wakeup_name)) { + ZVAL_STRINGL(&wakeup_name, "__wakeup", sizeof("__wakeup") - 1); + } + + BG(serialize_lock)++; + if (call_user_function_ex(CG(function_table), zv, &wakeup_name, &retval, 0, 0, 1, NULL) == FAILURE || Z_ISUNDEF(retval)) { + wakeup_failed = 1; + GC_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; + } + BG(serialize_lock)--; + + zval_ptr_dtor(&retval); + } else { + GC_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; + } + } + + zval_ptr_dtor(zv); } next = var_dtor_hash->next; efree_size(var_dtor_hash, sizeof(var_dtor_entries)); @@@ -283,7 -271,7 +316,7 @@@ static inline int unserialize_allowed_c #define YYMARKER marker - #line 291 "ext/standard/var_unserializer.re" -#line 279 "ext/standard/var_unserializer.re" ++#line 324 "ext/standard/var_unserializer.re" @@@ -528,18 -514,10 +559,10 @@@ static inline int object_common2(UNSERI ZVAL_DEREF(rval); if (has_wakeup) { - ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1); - BG(serialize_lock)++; - if (call_user_function_ex(CG(function_table), rval, &fname, &retval, 0, 0, 1, NULL) == FAILURE || Z_ISUNDEF(retval)) { - GC_FLAGS(Z_OBJ_P(rval)) |= IS_OBJ_DESTRUCTOR_CALLED; - } - BG(serialize_lock)--; - zval_dtor(&fname); - zval_dtor(&retval); - } - - if (EG(exception)) { - return 0; + /* Delay __wakeup call until end of serialization */ + zval *wakeup_var = var_tmp_var(var_hash); + ZVAL_COPY(wakeup_var, rval); - Z_VAR_FLAGS_P(wakeup_var) = VAR_WAKEUP_FLAG; ++ Z_ACCESS_FLAGS_P(wakeup_var) = VAR_WAKEUP_FLAG; } return finish_nested_data(UNSERIALIZE_PASSTHRU); @@@ -594,7 -578,7 +617,7 @@@ static int php_var_unserialize_internal start = cursor; - #line 598 "ext/standard/var_unserializer.c" -#line 582 "ext/standard/var_unserializer.c" ++#line 621 "ext/standard/var_unserializer.c" { YYCTYPE yych; static const unsigned char yybm[] = { @@@ -636,30 -619,29 +658,29 @@@ 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 975 "ext/standard/var_unserializer.re" -#line 959 "ext/standard/var_unserializer.re" ++#line 998 "ext/standard/var_unserializer.re" { return 0; } - #line 660 "ext/standard/var_unserializer.c" -#line 642 "ext/standard/var_unserializer.c" ++#line 681 "ext/standard/var_unserializer.c" yy4: yych = *(YYMARKER = ++YYCURSOR); - if (yych == ':') goto yy89; + if (yych == ':') goto yy17; goto yy3; yy5: yych = *++YYCURSOR; @@@ -695,20 -677,21 +716,21 @@@ yy12 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 969 "ext/standard/var_unserializer.re" -#line 953 "ext/standard/var_unserializer.re" ++#line 992 "ext/standard/var_unserializer.re" { /* this is the case where we have less data than planned */ php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data"); return 0; /* not sure if it should be 0 or 1 here? */ } - #line 709 "ext/standard/var_unserializer.c" - yy16: - yych = *++YYCURSOR; - goto yy3; -#line 695 "ext/standard/var_unserializer.c" ++#line 734 "ext/standard/var_unserializer.c" yy17: yych = *++YYCURSOR; if (yybm[0+yych] & 128) { @@@ -719,191 -702,109 +741,109 @@@ yy18 YYCURSOR = YYMARKER; goto yy3; yy19: + ++YYCURSOR; -#line 637 "ext/standard/var_unserializer.re" ++#line 676 "ext/standard/var_unserializer.re" + { + *p = YYCURSOR; + ZVAL_NULL(rval); + return 1; + } -#line 713 "ext/standard/var_unserializer.c" ++#line 752 "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 817 "ext/standard/var_unserializer.re" - { - size_t len, len2, len3, maxlen; - zend_long elements; - char *str; - zend_string *class_name; - zend_class_entry *ce; - int incomplete_class = 0; - - int custom_object = 0; - - zval user_func; - zval retval; - zval args[1]; - - if (!var_hash) return 0; - if (*start == 'C') { - custom_object = 1; - } - - len2 = len = parse_uiv(start + 2); - maxlen = max - YYCURSOR; - if (maxlen < len || len == 0) { - *p = start + 2; - return 0; - } - - str = (char*)YYCURSOR; - - YYCURSOR += len; - - if (*(YYCURSOR) != '"') { - *p = YYCURSOR; - return 0; - } - if (*(YYCURSOR+1) != ':') { - *p = YYCURSOR+1; - return 0; - } - - len3 = strspn(str, "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 = zend_string_init(str, len, 0); - - do { - if(!unserialize_allowed_class(class_name, var_hash)) { - incomplete_class = 1; - ce = PHP_IC_ENTRY; - break; - } - - /* Try to find class directly */ - BG(serialize_lock)++; - ce = zend_lookup_class(class_name); - if (ce) { - BG(serialize_lock)--; - if (EG(exception)) { - zend_string_release(class_name); - return 0; - } - break; - } - BG(serialize_lock)--; - - if (EG(exception)) { - zend_string_release(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 */ - ZVAL_STRING(&user_func, PG(unserialize_callback_func)); - - ZVAL_STR_COPY(&args[0], class_name); - BG(serialize_lock)++; - if (call_user_function_ex(CG(function_table), NULL, &user_func, &retval, 1, args, 0, NULL) != SUCCESS) { - BG(serialize_lock)--; - if (EG(exception)) { - zend_string_release(class_name); - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&args[0]); - return 0; - } - php_error_docref(NULL, E_WARNING, "defined (%s) but not found", Z_STRVAL(user_func)); - incomplete_class = 1; - ce = PHP_IC_ENTRY; - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&args[0]); - break; - } - BG(serialize_lock)--; - zval_ptr_dtor(&retval); - if (EG(exception)) { - zend_string_release(class_name); - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&args[0]); - return 0; - } - - /* The callback function may have defined the class */ - BG(serialize_lock)++; - if ((ce = zend_lookup_class(class_name)) == NULL) { - php_error_docref(NULL, E_WARNING, "Function %s() hasn't defined the class it was called for", Z_STRVAL(user_func)); - incomplete_class = 1; - ce = PHP_IC_ENTRY; + 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 { + if (yych <= '-') goto yy44; + if (yych <= '.') goto yy45; + goto yy18; } - BG(serialize_lock)--; - - zval_ptr_dtor(&user_func); - zval_ptr_dtor(&args[0]); - 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, ZSTR_VAL(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; } - zend_string_release(class_name); - return ret; } - - elements = object_common1(UNSERIALIZE_PASSTHRU, ce); - - if (elements < 0) { - zend_string_release(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, ZSTR_VAL(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; } - zend_string_release(class_name); - - return object_common2(UNSERIALIZE_PASSTHRU, elements); - } - #line 892 "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; @@@ -1146,7 -945,65 +984,65 @@@ yy59 yych = *++YYCURSOR; if (yych <= '/') goto yy18; if (yych >= ':') goto yy18; - yy61: + yy60: + ++YYCURSOR; + if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy60; + if (yych <= ':') goto yy81; + goto yy18; + yy62: + yych = *++YYCURSOR; + if (yych == '"') goto yy82; + goto yy18; + yy63: + ++YYCURSOR; -#line 586 "ext/standard/var_unserializer.re" ++#line 625 "ext/standard/var_unserializer.re" + { + zend_long id; + + *p = YYCURSOR; + if (!var_hash) return 0; + + id = parse_iv(start + 2) - 1; + if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) { + return 0; + } + + zval_ptr_dtor(rval); + if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) { + ZVAL_UNDEF(rval); + return 1; + } + if (Z_ISREF_P(rval_ref)) { + ZVAL_COPY(rval, rval_ref); + } else { + ZVAL_NEW_REF(rval_ref, rval_ref); + ZVAL_COPY(rval, rval_ref); + } + + return 1; + } -#line 989 "ext/standard/var_unserializer.c" ++#line 1028 "ext/standard/var_unserializer.c" + yy65: + yych = *++YYCURSOR; + if (yych == '"') goto yy84; + goto yy18; + yy66: + yych = *++YYCURSOR; + if (yych == '{') goto yy86; + goto yy18; + yy67: + ++YYCURSOR; -#line 643 "ext/standard/var_unserializer.re" ++#line 682 "ext/standard/var_unserializer.re" + { + *p = YYCURSOR; + ZVAL_BOOL(rval, parse_iv(start + 2)); + return 1; + } -#line 1006 "ext/standard/var_unserializer.c" ++#line 1045 "ext/standard/var_unserializer.c" + yy69: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; @@@ -1163,9 -1020,9 +1059,9 @@@ goto yy18; } } - yy63: + yy71: ++YYCURSOR; - #line 707 "ext/standard/var_unserializer.re" -#line 691 "ext/standard/var_unserializer.re" ++#line 730 "ext/standard/var_unserializer.re" { #if SIZEOF_ZEND_LONG == 4 use_double: @@@ -1174,112 -1031,32 +1070,32 @@@ ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL)); return 1; } - #line 1178 "ext/standard/var_unserializer.c" - yy65: -#line 1035 "ext/standard/var_unserializer.c" ++#line 1074 "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 691 "ext/standard/var_unserializer.re" -#line 649 "ext/standard/var_unserializer.re" ++#line 688 "ext/standard/var_unserializer.re" { - *p = YYCURSOR; - - if (!strncmp((char*)start + 2, "NAN", 3)) { - ZVAL_DOUBLE(rval, php_get_nan()); - } else if (!strncmp((char*)start + 2, "INF", 3)) { - ZVAL_DOUBLE(rval, php_get_inf()); - } else if (!strncmp((char*)start + 2, "-INF", 4)) { - ZVAL_DOUBLE(rval, -php_get_inf()); - } else { - ZVAL_NULL(rval); - } - - return 1; - } - #line 1253 "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 665 "ext/standard/var_unserializer.re" - { - #if SIZEOF_ZEND_LONG == 4 - int digits = YYCURSOR - start - 3; + #if SIZEOF_ZEND_LONG == 4 + int digits = YYCURSOR - start - 3; if (start[2] == '-' || start[2] == '+') { digits--; @@@ -1302,53 -1079,14 +1118,14 @@@ ZVAL_LONG(rval, parse_iv(start + 2)); return 1; } - #line 1306 "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 659 "ext/standard/var_unserializer.re" - { - *p = YYCURSOR; - ZVAL_BOOL(rval, parse_iv(start + 2)); - return 1; - } - #line 1320 "ext/standard/var_unserializer.c" - yy87: - ++YYCURSOR; - #line 653 "ext/standard/var_unserializer.re" - { - *p = YYCURSOR; - ZVAL_NULL(rval); - return 1; - } - #line 1329 "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 1083 "ext/standard/var_unserializer.c" ++#line 1122 "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 628 "ext/standard/var_unserializer.re" -#line 612 "ext/standard/var_unserializer.re" ++#line 651 "ext/standard/var_unserializer.re" { zend_long id; @@@ -1373,11 -1111,235 +1150,235 @@@ return 1; } -#line 1115 "ext/standard/var_unserializer.c" ++#line 1154 "ext/standard/var_unserializer.c" + yy81: + yych = *++YYCURSOR; + if (yych == '"') goto yy94; + goto yy18; + yy82: + ++YYCURSOR; -#line 801 "ext/standard/var_unserializer.re" ++#line 840 "ext/standard/var_unserializer.re" + { + size_t len, len2, len3, maxlen; + zend_long elements; + char *str; + zend_string *class_name; + zend_class_entry *ce; + int incomplete_class = 0; + + int custom_object = 0; + + zval user_func; + zval retval; + zval args[1]; + + if (!var_hash) return 0; + if (*start == 'C') { + custom_object = 1; + } + + len2 = len = parse_uiv(start + 2); + maxlen = max - YYCURSOR; + if (maxlen < len || len == 0) { + *p = start + 2; + return 0; + } + + str = (char*)YYCURSOR; + + YYCURSOR += len; + + if (*(YYCURSOR) != '"') { + *p = YYCURSOR; + return 0; + } + if (*(YYCURSOR+1) != ':') { + *p = YYCURSOR+1; + return 0; + } + + len3 = strspn(str, "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 = zend_string_init(str, len, 0); + + do { - if(!unserialize_allowed_class(class_name, classes)) { ++ if(!unserialize_allowed_class(class_name, var_hash)) { + incomplete_class = 1; + ce = PHP_IC_ENTRY; + break; + } + + /* Try to find class directly */ + BG(serialize_lock)++; + ce = zend_lookup_class(class_name); + if (ce) { + BG(serialize_lock)--; + if (EG(exception)) { + zend_string_release(class_name); + return 0; + } + break; + } + BG(serialize_lock)--; + + if (EG(exception)) { + zend_string_release(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 */ + ZVAL_STRING(&user_func, PG(unserialize_callback_func)); + + ZVAL_STR_COPY(&args[0], class_name); + BG(serialize_lock)++; + if (call_user_function_ex(CG(function_table), NULL, &user_func, &retval, 1, args, 0, NULL) != SUCCESS) { + BG(serialize_lock)--; + if (EG(exception)) { + zend_string_release(class_name); + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&args[0]); + return 0; + } + php_error_docref(NULL, E_WARNING, "defined (%s) but not found", Z_STRVAL(user_func)); + incomplete_class = 1; + ce = PHP_IC_ENTRY; + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&args[0]); + break; + } + BG(serialize_lock)--; + zval_ptr_dtor(&retval); + if (EG(exception)) { + zend_string_release(class_name); + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&args[0]); + return 0; + } + + /* The callback function may have defined the class */ + BG(serialize_lock)++; + if ((ce = zend_lookup_class(class_name)) == NULL) { + php_error_docref(NULL, E_WARNING, "Function %s() hasn't defined the class it was called for", Z_STRVAL(user_func)); + incomplete_class = 1; + ce = PHP_IC_ENTRY; + } + BG(serialize_lock)--; + + zval_ptr_dtor(&user_func); + zval_ptr_dtor(&args[0]); + 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, ZSTR_VAL(class_name), len2); + } + zend_string_release(class_name); + return ret; + } + + elements = object_common1(UNSERIALIZE_PASSTHRU, ce); + + if (elements < 0) { + zend_string_release(class_name); + return 0; + } + + if (incomplete_class) { + php_store_class_name(rval, ZSTR_VAL(class_name), len2); + } + zend_string_release(class_name); + + return object_common2(UNSERIALIZE_PASSTHRU, elements); + } -#line 1274 "ext/standard/var_unserializer.c" ++#line 1313 "ext/standard/var_unserializer.c" + yy84: + ++YYCURSOR; -#line 732 "ext/standard/var_unserializer.re" ++#line 771 "ext/standard/var_unserializer.re" + { + size_t len, maxlen; + zend_string *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) != '"') { + zend_string_free(str); + *p = YYCURSOR; + return 0; + } + + if (*(YYCURSOR + 1) != ';') { + efree(str); + *p = YYCURSOR + 1; + return 0; + } + + YYCURSOR += 2; + *p = YYCURSOR; + + ZVAL_STR(rval, str); + return 1; + } -#line 1311 "ext/standard/var_unserializer.c" ++#line 1350 "ext/standard/var_unserializer.c" + yy86: + ++YYCURSOR; -#line 766 "ext/standard/var_unserializer.re" ++#line 805 "ext/standard/var_unserializer.re" + { + zend_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; + } + + array_init_size(rval, elements); + if (elements) { + /* we can't convert from packed to hash during unserialization, because + reference to some zvals might be keept in var_hash (to support references) */ + zend_hash_real_init(Z_ARRVAL_P(rval), 0); + } + + if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_P(rval), elements, 0)) { + return 0; + } + + return finish_nested_data(UNSERIALIZE_PASSTHRU); + } -#line 1338 "ext/standard/var_unserializer.c" +#line 1377 "ext/standard/var_unserializer.c" - yy95: + yy88: yych = *++YYCURSOR; if (yych <= ',') { - if (yych != '+') goto yy18; + if (yych == '+') goto yy96; + goto yy18; } else { if (yych <= '-') goto yy96; if (yych <= '/') goto yy18; @@@ -1393,38 -1350,88 +1389,88 @@@ yy89 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 602 "ext/standard/var_unserializer.re" -#line 790 "ext/standard/var_unserializer.re" ++#line 829 "ext/standard/var_unserializer.re" { - zend_long id; + long elements; + if (!var_hash) return 0; - *p = YYCURSOR; - if (!var_hash) return 0; + elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR); + if (elements < 0) { + return 0; + } + return object_common2(UNSERIALIZE_PASSTHRU, elements); + } -#line 1374 "ext/standard/var_unserializer.c" ++#line 1413 "ext/standard/var_unserializer.c" + yy94: + ++YYCURSOR; -#line 700 "ext/standard/var_unserializer.re" ++#line 739 "ext/standard/var_unserializer.re" + { + size_t len, maxlen; + char *str; - id = parse_iv(start + 2) - 1; - if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) { + len = parse_uiv(start + 2); + maxlen = max - YYCURSOR; + if (maxlen < len) { + *p = start + 2; return 0; } - zval_ptr_dtor(rval); - if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) { - ZVAL_UNDEF(rval); - return 1; + str = (char*)YYCURSOR; + + YYCURSOR += len; + + if (*(YYCURSOR) != '"') { + *p = YYCURSOR; + return 0; } - if (Z_ISREF_P(rval_ref)) { - ZVAL_COPY(rval, rval_ref); + + if (*(YYCURSOR + 1) != ';') { + *p = YYCURSOR + 1; + return 0; + } + + YYCURSOR += 2; + *p = YYCURSOR; + + ZVAL_STRINGL(rval, str, len); + return 1; + } -#line 1409 "ext/standard/var_unserializer.c" ++#line 1448 "ext/standard/var_unserializer.c" + yy96: + yych = *++YYCURSOR; + if (yych <= '/') goto yy18; + if (yych <= '9') goto yy89; + goto yy18; + yy97: + ++YYCURSOR; -#line 675 "ext/standard/var_unserializer.re" ++#line 714 "ext/standard/var_unserializer.re" + { + *p = YYCURSOR; + + if (!strncmp((char*)start + 2, "NAN", 3)) { + ZVAL_DOUBLE(rval, php_get_nan()); + } else if (!strncmp((char*)start + 2, "INF", 3)) { + ZVAL_DOUBLE(rval, php_get_inf()); + } else if (!strncmp((char*)start + 2, "-INF", 4)) { + ZVAL_DOUBLE(rval, -php_get_inf()); } else { - ZVAL_NEW_REF(rval_ref, rval_ref); - ZVAL_COPY(rval, rval_ref); + ZVAL_NULL(rval); } return 1; } - #line 1426 "ext/standard/var_unserializer.c" -#line 1433 "ext/standard/var_unserializer.c" ++#line 1472 "ext/standard/var_unserializer.c" } - #line 977 "ext/standard/var_unserializer.re" -#line 961 "ext/standard/var_unserializer.re" ++#line 1000 "ext/standard/var_unserializer.re" return 0; diff --cc ext/standard/var_unserializer.re index f5a64a8f2d,b5f459a632..c9272e92be --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@@ -137,6 -97,7 +140,7 @@@ PHPAPI zval *var_tmp_var(php_unserializ (*var_hashx)->last_dtor = var_hash; } ZVAL_UNDEF(&var_hash->data[var_hash->used_slots]); - Z_VAR_FLAGS(var_hash->data[var_hash->used_slots]) = 0; ++ Z_ACCESS_FLAGS(var_hash->data[var_hash->used_slots]) = 0; return &var_hash->data[var_hash->used_slots++]; } @@@ -199,7 -165,29 +208,29 @@@ PHPAPI void var_destroy(php_unserialize #if VAR_ENTRIES_DBG fprintf(stderr, "var_destroy dtor(%p, %ld)\n", var_dtor_hash->data[i], Z_REFCOUNT_P(var_dtor_hash->data[i])); #endif - zval_ptr_dtor(&var_dtor_hash->data[i]); + + /* Perform delayed __wakeup calls */ - if (Z_VAR_FLAGS_P(zv) == VAR_WAKEUP_FLAG) { ++ if (Z_ACCESS_FLAGS_P(zv) == VAR_WAKEUP_FLAG) { + if (!wakeup_failed) { + zval retval; + if (Z_ISUNDEF(wakeup_name)) { + ZVAL_STRINGL(&wakeup_name, "__wakeup", sizeof("__wakeup") - 1); + } + + BG(serialize_lock)++; + if (call_user_function_ex(CG(function_table), zv, &wakeup_name, &retval, 0, 0, 1, NULL) == FAILURE || Z_ISUNDEF(retval)) { + wakeup_failed = 1; + GC_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; + } + BG(serialize_lock)--; + + zval_ptr_dtor(&retval); + } else { + GC_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; + } + } + + zval_ptr_dtor(zv); } next = var_dtor_hash->next; efree_size(var_dtor_hash, sizeof(var_dtor_entries)); @@@ -532,18 -518,10 +563,10 @@@ static inline int object_common2(UNSERI ZVAL_DEREF(rval); if (has_wakeup) { - ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1); - BG(serialize_lock)++; - if (call_user_function_ex(CG(function_table), rval, &fname, &retval, 0, 0, 1, NULL) == FAILURE || Z_ISUNDEF(retval)) { - GC_FLAGS(Z_OBJ_P(rval)) |= IS_OBJ_DESTRUCTOR_CALLED; - } - BG(serialize_lock)--; - zval_dtor(&fname); - zval_dtor(&retval); - } - - if (EG(exception)) { - return 0; + /* Delay __wakeup call until end of serialization */ + zval *wakeup_var = var_tmp_var(var_hash); + ZVAL_COPY(wakeup_var, rval); - Z_VAR_FLAGS_P(wakeup_var) = VAR_WAKEUP_FLAG; ++ Z_ACCESS_FLAGS_P(wakeup_var) = VAR_WAKEUP_FLAG; } return finish_nested_data(UNSERIALIZE_PASSTHRU);