com php-src: Merge branch 'PHP-5.6': ext/standard/var_unseria lizer.c ext/standard/var_unserializer.re
| From: | Stanislav Malyshev | Date: | Tue, 16 Dec 2014 18:25:03 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/standard/var_unseria lizer.c ext/standard/var_unserializer.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83752@lists.php.net to get a copy of this message | ||
Commit: 9152214c1e20723f73b5f7b6c77b1183327bcf69
Author: Stanislav Malyshev <stas@php.net> Tue, 16 Dec 2014 10:25:03 -0800
Parents: 3a18597774d4b63a134db0c38235be9fa72f9560 681a1afd3f76e97b243184e83ab826633e851cc3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9152214c1e20723f73b5f7b6c77b1183327bcf69
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
Bugs:
https://bugs.php.net/68594
Changed paths:
MM ext/standard/var_unserializer.c
MM ext/standard/var_unserializer.re
diff --cc ext/standard/var_unserializer.c index 0217bba,d9bf586..00a5886 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@@ -361,29 -341,16 +361,23 @@@ static inline int process_nested_data(U } } else { /* object properties should include no integers */ - convert_to_string(key); - if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + convert_to_string(&key); - //??? - #if 1 - data = zend_hash_update_ind(ht, Z_STR(key), &d); - #else - if ((data = zend_hash_find(ht, Z_STR(key))) != NULL) { - if (Z_TYPE_P(data) == IS_INDIRECT) { - data = Z_INDIRECT_P(data); ++ if ((old_data = zend_hash_find(ht, Z_STR(key))) != NULL) { ++ if (Z_TYPE_P(old_data) == IS_INDIRECT) { ++ old_data = Z_INDIRECT_P(old_data); + } - zval_ptr_dtor(data); - //??? var_push_dtor(var_hash, data); - ZVAL_UNDEF(data); - } else { - data = zend_hash_update(ht, Z_STR(key), &d); - } - #endif ++ zval_ptr_dtor(old_data); + var_push_dtor(var_hash, old_data); - } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, - sizeof data, NULL); ++ ZVAL_UNDEF(old_data); ++ } ++ data = zend_hash_update(ht, Z_STR(key), &d); } - zval_dtor(key); - FREE_ZVAL(key); + zval_dtor(&key); + + if (!php_var_unserialize_ex(data, p, max, var_hash, classes TSRMLS_CC)) { + return 0; + } if (elements && *(*p-1) != ';' && *(*p-1) != '}') { (*p)--; @@@ -514,8 -475,10 +508,8 @@@ PHPAPI int php_var_unserialize_ex(UNSER start = cursor; - - - #line 519 "ext/standard/var_unserializer.c" -#line 482 "ext/standard/var_unserializer.c" ++#line 513 "ext/standard/var_unserializer.c" { YYCTYPE yych; static const unsigned char yybm[] = { @@@ -575,9 -538,9 +569,9 @@@ yy2 yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy95; yy3: - #line 866 "ext/standard/var_unserializer.re" -#line 833 "ext/standard/var_unserializer.re" ++#line 860 "ext/standard/var_unserializer.re" { return 0; } - #line 581 "ext/standard/var_unserializer.c" -#line 544 "ext/standard/var_unserializer.c" ++#line 575 "ext/standard/var_unserializer.c" yy4: yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy89; @@@ -620,13 -583,13 +614,13 @@@ yy13 goto yy3; yy14: ++YYCURSOR; - #line 860 "ext/standard/var_unserializer.re" -#line 827 "ext/standard/var_unserializer.re" ++#line 854 "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 630 "ext/standard/var_unserializer.c" -#line 593 "ext/standard/var_unserializer.c" ++#line 624 "ext/standard/var_unserializer.c" yy16: yych = *++YYCURSOR; goto yy3; @@@ -656,13 -620,13 +651,13 @@@ yy20 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 715 "ext/standard/var_unserializer.re" -#line 681 "ext/standard/var_unserializer.re" ++#line 709 "ext/standard/var_unserializer.re" { size_t len, len2, len3, maxlen; - long elements; - char *class_name; + zend_long elements; + char *str; + zend_string *class_name; zend_class_entry *ce; - zend_class_entry **pce; int incomplete_class = 0; int custom_object = 0; @@@ -801,7 -766,7 +796,7 @@@ return object_common2(UNSERIALIZE_PASSTHRU, elements); } - #line 805 "ext/standard/var_unserializer.c" -#line 770 "ext/standard/var_unserializer.c" ++#line 800 "ext/standard/var_unserializer.c" yy25: yych = *++YYCURSOR; if (yych <= ',') { @@@ -826,15 -791,15 +821,15 @@@ yy27 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 707 "ext/standard/var_unserializer.re" -#line 673 "ext/standard/var_unserializer.re" ++#line 701 "ext/standard/var_unserializer.re" { - INIT_PZVAL(*rval); +//??? INIT_PZVAL(rval); return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } - #line 838 "ext/standard/var_unserializer.c" -#line 803 "ext/standard/var_unserializer.c" ++#line 833 "ext/standard/var_unserializer.c" yy32: yych = *++YYCURSOR; if (yych == '+') goto yy33; @@@ -855,9 -820,9 +850,9 @@@ yy34 yych = *++YYCURSOR; if (yych != '{') goto yy18; ++YYCURSOR; - #line 686 "ext/standard/var_unserializer.re" -#line 653 "ext/standard/var_unserializer.re" ++#line 680 "ext/standard/var_unserializer.re" { - long elements = parse_iv(start + 2); + zend_long elements = parse_iv(start + 2); /* use iv() not uiv() in order to check data range */ *p = YYCURSOR; @@@ -876,7 -840,7 +871,7 @@@ return finish_nested_data(UNSERIALIZE_PASSTHRU); } - #line 880 "ext/standard/var_unserializer.c" -#line 844 "ext/standard/var_unserializer.c" ++#line 875 "ext/standard/var_unserializer.c" yy39: yych = *++YYCURSOR; if (yych == '+') goto yy40; @@@ -897,10 -861,10 +892,10 @@@ yy41 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 658 "ext/standard/var_unserializer.re" -#line 624 "ext/standard/var_unserializer.re" ++#line 652 "ext/standard/var_unserializer.re" { size_t len, maxlen; - char *str; + zend_string *str; len = parse_uiv(start + 2); maxlen = max - YYCURSOR; @@@ -922,10 -886,11 +917,10 @@@ YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 0); + ZVAL_STR(rval, str); return 1; } - #line 929 "ext/standard/var_unserializer.c" -#line 894 "ext/standard/var_unserializer.c" ++#line 924 "ext/standard/var_unserializer.c" yy46: yych = *++YYCURSOR; if (yych == '+') goto yy47; @@@ -946,7 -911,7 +941,7 @@@ yy48 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 631 "ext/standard/var_unserializer.re" -#line 596 "ext/standard/var_unserializer.re" ++#line 625 "ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@@ -970,10 -935,11 +965,10 @@@ YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 1); + ZVAL_STRINGL(rval, str, len); return 1; } - #line 977 "ext/standard/var_unserializer.c" -#line 943 "ext/standard/var_unserializer.c" ++#line 972 "ext/standard/var_unserializer.c" yy53: yych = *++YYCURSOR; if (yych <= '/') { @@@ -1061,16 -1027,17 +1056,16 @@@ yy61 } yy63: ++YYCURSOR; - #line 622 "ext/standard/var_unserializer.re" -#line 586 "ext/standard/var_unserializer.re" ++#line 616 "ext/standard/var_unserializer.re" { -#if SIZEOF_LONG == 4 +#if SIZEOF_ZEND_LONG == 4 use_double: #endif *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL)); + ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL)); return 1; } - #line 1074 "ext/standard/var_unserializer.c" -#line 1041 "ext/standard/var_unserializer.c" ++#line 1069 "ext/standard/var_unserializer.c" yy65: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1129,23 -1096,22 +1124,23 @@@ yy73 yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; - #line 606 "ext/standard/var_unserializer.re" -#line 571 "ext/standard/var_unserializer.re" ++#line 600 "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()); + + 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 1149 "ext/standard/var_unserializer.c" -#line 1115 "ext/standard/var_unserializer.c" ++#line 1144 "ext/standard/var_unserializer.c" yy76: yych = *++YYCURSOR; if (yych == 'N') goto yy73; @@@ -1172,9 -1138,9 +1167,9 @@@ yy79 if (yych <= '9') goto yy79; if (yych != ';') goto yy18; ++YYCURSOR; - #line 580 "ext/standard/var_unserializer.re" -#line 544 "ext/standard/var_unserializer.re" ++#line 574 "ext/standard/var_unserializer.re" { -#if SIZEOF_LONG == 4 +#if SIZEOF_ZEND_LONG == 4 int digits = YYCURSOR - start - 3; if (start[2] == '-' || start[2] == '+') { @@@ -1195,10 -1161,11 +1190,10 @@@ } #endif *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_LONG(*rval, parse_iv(start + 2)); + ZVAL_LONG(rval, parse_iv(start + 2)); return 1; } - #line 1202 "ext/standard/var_unserializer.c" -#line 1169 "ext/standard/var_unserializer.c" ++#line 1197 "ext/standard/var_unserializer.c" yy83: yych = *++YYCURSOR; if (yych <= '/') goto yy18; @@@ -1206,22 -1173,24 +1201,22 @@@ yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; - #line 574 "ext/standard/var_unserializer.re" -#line 537 "ext/standard/var_unserializer.re" ++#line 568 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_BOOL(*rval, parse_iv(start + 2)); + ZVAL_BOOL(rval, parse_iv(start + 2)); return 1; } - #line 1216 "ext/standard/var_unserializer.c" -#line 1184 "ext/standard/var_unserializer.c" ++#line 1211 "ext/standard/var_unserializer.c" yy87: ++YYCURSOR; - #line 568 "ext/standard/var_unserializer.re" -#line 530 "ext/standard/var_unserializer.re" ++#line 562 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_NULL(*rval); + ZVAL_NULL(rval); return 1; } - #line 1225 "ext/standard/var_unserializer.c" -#line 1194 "ext/standard/var_unserializer.c" ++#line 1220 "ext/standard/var_unserializer.c" yy89: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1244,9 -1213,9 +1239,9 @@@ yy91 if (yych <= '9') goto yy91; if (yych != ';') goto yy18; ++YYCURSOR; - #line 545 "ext/standard/var_unserializer.re" -#line 507 "ext/standard/var_unserializer.re" ++#line 539 "ext/standard/var_unserializer.re" { - long id; + zend_long id; *p = YYCURSOR; if (!var_hash) return 0; @@@ -1267,7 -1236,7 +1262,7 @@@ return 1; } - #line 1271 "ext/standard/var_unserializer.c" -#line 1240 "ext/standard/var_unserializer.c" ++#line 1266 "ext/standard/var_unserializer.c" yy95: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1290,9 -1259,9 +1285,9 @@@ yy97 if (yych <= '9') goto yy97; if (yych != ';') goto yy18; ++YYCURSOR; - #line 523 "ext/standard/var_unserializer.re" -#line 486 "ext/standard/var_unserializer.re" ++#line 517 "ext/standard/var_unserializer.re" { - long id; + zend_long id; *p = YYCURSOR; if (!var_hash) return 0; @@@ -1312,9 -1277,12 +1307,9 @@@ return 1; } - #line 1316 "ext/standard/var_unserializer.c" -#line 1284 "ext/standard/var_unserializer.c" ++#line 1311 "ext/standard/var_unserializer.c" } - #line 868 "ext/standard/var_unserializer.re" -#line 835 "ext/standard/var_unserializer.re" ++#line 862 "ext/standard/var_unserializer.re" return 0; diff --cc ext/standard/var_unserializer.re index c787167,387ba6a..5108987 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@@ -365,29 -345,16 +365,23 @@@ static inline int process_nested_data(U } } else { /* object properties should include no integers */ - convert_to_string(key); - if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + convert_to_string(&key); - //??? - #if 1 - data = zend_hash_update_ind(ht, Z_STR(key), &d); - #else - if ((data = zend_hash_find(ht, Z_STR(key))) != NULL) { - if (Z_TYPE_P(data) == IS_INDIRECT) { - data = Z_INDIRECT_P(data); ++ if ((old_data = zend_hash_find(ht, Z_STR(key))) != NULL) { ++ if (Z_TYPE_P(old_data) == IS_INDIRECT) { ++ old_data = Z_INDIRECT_P(old_data); + } - zval_ptr_dtor(data); - //??? var_push_dtor(var_hash, data); - ZVAL_UNDEF(data); - } else { - data = zend_hash_update(ht, Z_STR(key), &d); - } - #endif ++ zval_ptr_dtor(old_data); + var_push_dtor(var_hash, old_data); - } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, - sizeof data, NULL); ++ ZVAL_UNDEF(old_data); ++ } ++ data = zend_hash_update(ht, Z_STR(key), &d); } - zval_dtor(key); - FREE_ZVAL(key); + zval_dtor(&key); + + if (!php_var_unserialize_ex(data, p, max, var_hash, classes TSRMLS_CC)) { + return 0; + } if (elements && *(*p-1) != ';' && *(*p-1) != '}') { (*p)--;
diff --cc ext/standard/var_unserializer.c index 0217bba,d9bf586..00a5886 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@@ -361,29 -341,16 +361,23 @@@ static inline int process_nested_data(U } } else { /* object properties should include no integers */ - convert_to_string(key); - if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + convert_to_string(&key); - //??? - #if 1 - data = zend_hash_update_ind(ht, Z_STR(key), &d); - #else - if ((data = zend_hash_find(ht, Z_STR(key))) != NULL) { - if (Z_TYPE_P(data) == IS_INDIRECT) { - data = Z_INDIRECT_P(data); ++ if ((old_data = zend_hash_find(ht, Z_STR(key))) != NULL) { ++ if (Z_TYPE_P(old_data) == IS_INDIRECT) { ++ old_data = Z_INDIRECT_P(old_data); + } - zval_ptr_dtor(data); - //??? var_push_dtor(var_hash, data); - ZVAL_UNDEF(data); - } else { - data = zend_hash_update(ht, Z_STR(key), &d); - } - #endif ++ zval_ptr_dtor(old_data); + var_push_dtor(var_hash, old_data); - } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, - sizeof data, NULL); ++ ZVAL_UNDEF(old_data); ++ } ++ data = zend_hash_update(ht, Z_STR(key), &d); } - zval_dtor(key); - FREE_ZVAL(key); + zval_dtor(&key); + + if (!php_var_unserialize_ex(data, p, max, var_hash, classes TSRMLS_CC)) { + return 0; + } if (elements && *(*p-1) != ';' && *(*p-1) != '}') { (*p)--; @@@ -514,8 -475,10 +508,8 @@@ PHPAPI int php_var_unserialize_ex(UNSER start = cursor; - - - #line 519 "ext/standard/var_unserializer.c" -#line 482 "ext/standard/var_unserializer.c" ++#line 513 "ext/standard/var_unserializer.c" { YYCTYPE yych; static const unsigned char yybm[] = { @@@ -575,9 -538,9 +569,9 @@@ yy2 yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy95; yy3: - #line 866 "ext/standard/var_unserializer.re" -#line 833 "ext/standard/var_unserializer.re" ++#line 860 "ext/standard/var_unserializer.re" { return 0; } - #line 581 "ext/standard/var_unserializer.c" -#line 544 "ext/standard/var_unserializer.c" ++#line 575 "ext/standard/var_unserializer.c" yy4: yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy89; @@@ -620,13 -583,13 +614,13 @@@ yy13 goto yy3; yy14: ++YYCURSOR; - #line 860 "ext/standard/var_unserializer.re" -#line 827 "ext/standard/var_unserializer.re" ++#line 854 "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 630 "ext/standard/var_unserializer.c" -#line 593 "ext/standard/var_unserializer.c" ++#line 624 "ext/standard/var_unserializer.c" yy16: yych = *++YYCURSOR; goto yy3; @@@ -656,13 -620,13 +651,13 @@@ yy20 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 715 "ext/standard/var_unserializer.re" -#line 681 "ext/standard/var_unserializer.re" ++#line 709 "ext/standard/var_unserializer.re" { size_t len, len2, len3, maxlen; - long elements; - char *class_name; + zend_long elements; + char *str; + zend_string *class_name; zend_class_entry *ce; - zend_class_entry **pce; int incomplete_class = 0; int custom_object = 0; @@@ -801,7 -766,7 +796,7 @@@ return object_common2(UNSERIALIZE_PASSTHRU, elements); } - #line 805 "ext/standard/var_unserializer.c" -#line 770 "ext/standard/var_unserializer.c" ++#line 800 "ext/standard/var_unserializer.c" yy25: yych = *++YYCURSOR; if (yych <= ',') { @@@ -826,15 -791,15 +821,15 @@@ yy27 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 707 "ext/standard/var_unserializer.re" -#line 673 "ext/standard/var_unserializer.re" ++#line 701 "ext/standard/var_unserializer.re" { - INIT_PZVAL(*rval); +//??? INIT_PZVAL(rval); return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } - #line 838 "ext/standard/var_unserializer.c" -#line 803 "ext/standard/var_unserializer.c" ++#line 833 "ext/standard/var_unserializer.c" yy32: yych = *++YYCURSOR; if (yych == '+') goto yy33; @@@ -855,9 -820,9 +850,9 @@@ yy34 yych = *++YYCURSOR; if (yych != '{') goto yy18; ++YYCURSOR; - #line 686 "ext/standard/var_unserializer.re" -#line 653 "ext/standard/var_unserializer.re" ++#line 680 "ext/standard/var_unserializer.re" { - long elements = parse_iv(start + 2); + zend_long elements = parse_iv(start + 2); /* use iv() not uiv() in order to check data range */ *p = YYCURSOR; @@@ -876,7 -840,7 +871,7 @@@ return finish_nested_data(UNSERIALIZE_PASSTHRU); } - #line 880 "ext/standard/var_unserializer.c" -#line 844 "ext/standard/var_unserializer.c" ++#line 875 "ext/standard/var_unserializer.c" yy39: yych = *++YYCURSOR; if (yych == '+') goto yy40; @@@ -897,10 -861,10 +892,10 @@@ yy41 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 658 "ext/standard/var_unserializer.re" -#line 624 "ext/standard/var_unserializer.re" ++#line 652 "ext/standard/var_unserializer.re" { size_t len, maxlen; - char *str; + zend_string *str; len = parse_uiv(start + 2); maxlen = max - YYCURSOR; @@@ -922,10 -886,11 +917,10 @@@ YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 0); + ZVAL_STR(rval, str); return 1; } - #line 929 "ext/standard/var_unserializer.c" -#line 894 "ext/standard/var_unserializer.c" ++#line 924 "ext/standard/var_unserializer.c" yy46: yych = *++YYCURSOR; if (yych == '+') goto yy47; @@@ -946,7 -911,7 +941,7 @@@ yy48 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 631 "ext/standard/var_unserializer.re" -#line 596 "ext/standard/var_unserializer.re" ++#line 625 "ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@@ -970,10 -935,11 +965,10 @@@ YYCURSOR += 2; *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_STRINGL(*rval, str, len, 1); + ZVAL_STRINGL(rval, str, len); return 1; } - #line 977 "ext/standard/var_unserializer.c" -#line 943 "ext/standard/var_unserializer.c" ++#line 972 "ext/standard/var_unserializer.c" yy53: yych = *++YYCURSOR; if (yych <= '/') { @@@ -1061,16 -1027,17 +1056,16 @@@ yy61 } yy63: ++YYCURSOR; - #line 622 "ext/standard/var_unserializer.re" -#line 586 "ext/standard/var_unserializer.re" ++#line 616 "ext/standard/var_unserializer.re" { -#if SIZEOF_LONG == 4 +#if SIZEOF_ZEND_LONG == 4 use_double: #endif *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL)); + ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL)); return 1; } - #line 1074 "ext/standard/var_unserializer.c" -#line 1041 "ext/standard/var_unserializer.c" ++#line 1069 "ext/standard/var_unserializer.c" yy65: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1129,23 -1096,22 +1124,23 @@@ yy73 yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; - #line 606 "ext/standard/var_unserializer.re" -#line 571 "ext/standard/var_unserializer.re" ++#line 600 "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()); + + 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 1149 "ext/standard/var_unserializer.c" -#line 1115 "ext/standard/var_unserializer.c" ++#line 1144 "ext/standard/var_unserializer.c" yy76: yych = *++YYCURSOR; if (yych == 'N') goto yy73; @@@ -1172,9 -1138,9 +1167,9 @@@ yy79 if (yych <= '9') goto yy79; if (yych != ';') goto yy18; ++YYCURSOR; - #line 580 "ext/standard/var_unserializer.re" -#line 544 "ext/standard/var_unserializer.re" ++#line 574 "ext/standard/var_unserializer.re" { -#if SIZEOF_LONG == 4 +#if SIZEOF_ZEND_LONG == 4 int digits = YYCURSOR - start - 3; if (start[2] == '-' || start[2] == '+') { @@@ -1195,10 -1161,11 +1190,10 @@@ } #endif *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_LONG(*rval, parse_iv(start + 2)); + ZVAL_LONG(rval, parse_iv(start + 2)); return 1; } - #line 1202 "ext/standard/var_unserializer.c" -#line 1169 "ext/standard/var_unserializer.c" ++#line 1197 "ext/standard/var_unserializer.c" yy83: yych = *++YYCURSOR; if (yych <= '/') goto yy18; @@@ -1206,22 -1173,24 +1201,22 @@@ yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; - #line 574 "ext/standard/var_unserializer.re" -#line 537 "ext/standard/var_unserializer.re" ++#line 568 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_BOOL(*rval, parse_iv(start + 2)); + ZVAL_BOOL(rval, parse_iv(start + 2)); return 1; } - #line 1216 "ext/standard/var_unserializer.c" -#line 1184 "ext/standard/var_unserializer.c" ++#line 1211 "ext/standard/var_unserializer.c" yy87: ++YYCURSOR; - #line 568 "ext/standard/var_unserializer.re" -#line 530 "ext/standard/var_unserializer.re" ++#line 562 "ext/standard/var_unserializer.re" { *p = YYCURSOR; - INIT_PZVAL(*rval); - ZVAL_NULL(*rval); + ZVAL_NULL(rval); return 1; } - #line 1225 "ext/standard/var_unserializer.c" -#line 1194 "ext/standard/var_unserializer.c" ++#line 1220 "ext/standard/var_unserializer.c" yy89: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1244,9 -1213,9 +1239,9 @@@ yy91 if (yych <= '9') goto yy91; if (yych != ';') goto yy18; ++YYCURSOR; - #line 545 "ext/standard/var_unserializer.re" -#line 507 "ext/standard/var_unserializer.re" ++#line 539 "ext/standard/var_unserializer.re" { - long id; + zend_long id; *p = YYCURSOR; if (!var_hash) return 0; @@@ -1267,7 -1236,7 +1262,7 @@@ return 1; } - #line 1271 "ext/standard/var_unserializer.c" -#line 1240 "ext/standard/var_unserializer.c" ++#line 1266 "ext/standard/var_unserializer.c" yy95: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1290,9 -1259,9 +1285,9 @@@ yy97 if (yych <= '9') goto yy97; if (yych != ';') goto yy18; ++YYCURSOR; - #line 523 "ext/standard/var_unserializer.re" -#line 486 "ext/standard/var_unserializer.re" ++#line 517 "ext/standard/var_unserializer.re" { - long id; + zend_long id; *p = YYCURSOR; if (!var_hash) return 0; @@@ -1312,9 -1277,12 +1307,9 @@@ return 1; } - #line 1316 "ext/standard/var_unserializer.c" -#line 1284 "ext/standard/var_unserializer.c" ++#line 1311 "ext/standard/var_unserializer.c" } - #line 868 "ext/standard/var_unserializer.re" -#line 835 "ext/standard/var_unserializer.re" ++#line 862 "ext/standard/var_unserializer.re" return 0; diff --cc ext/standard/var_unserializer.re index c787167,387ba6a..5108987 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@@ -365,29 -345,16 +365,23 @@@ static inline int process_nested_data(U } } else { /* object properties should include no integers */ - convert_to_string(key); - if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + convert_to_string(&key); - //??? - #if 1 - data = zend_hash_update_ind(ht, Z_STR(key), &d); - #else - if ((data = zend_hash_find(ht, Z_STR(key))) != NULL) { - if (Z_TYPE_P(data) == IS_INDIRECT) { - data = Z_INDIRECT_P(data); ++ if ((old_data = zend_hash_find(ht, Z_STR(key))) != NULL) { ++ if (Z_TYPE_P(old_data) == IS_INDIRECT) { ++ old_data = Z_INDIRECT_P(old_data); + } - zval_ptr_dtor(data); - //??? var_push_dtor(var_hash, data); - ZVAL_UNDEF(data); - } else { - data = zend_hash_update(ht, Z_STR(key), &d); - } - #endif ++ zval_ptr_dtor(old_data); + var_push_dtor(var_hash, old_data); - } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, - sizeof data, NULL); ++ ZVAL_UNDEF(old_data); ++ } ++ data = zend_hash_update(ht, Z_STR(key), &d); } - zval_dtor(key); - FREE_ZVAL(key); + zval_dtor(&key); + + if (!php_var_unserialize_ex(data, p, max, var_hash, classes TSRMLS_CC)) { + return 0; + } if (elements && *(*p-1) != ';' && *(*p-1) != '}') { (*p)--;