com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/standard/var_unserializer.c ext/standard/var_unseri alizer.re

Commit: 878b8f046593085365466f20c756a2d429164707 Author: Nikita Popov <nikic@php.net> Sun, 1 Jan 2017 14:13:29 +0100 Parents: 2a340423236938b8c6962f245f0ba99a6345d2f3 9f560baef5eacbe3fdb6a23a2d4e1996a30a2d2c Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=878b8f046593085365466f20c756a2d429164707 Log: Merge branch 'PHP-7.0' into PHP-7.1 Changed paths: MM NEWS MM ext/standard/var_unserializer.c MM ext/standard/var_unserializer.re Diff: diff --cc NEWS index d06b6c4,649fda3..3a87745 --- a/NEWS +++ b/NEWS @@@ -53,10 -43,13 +53,12 @@@ PH set). (cmb) - Standard: - . Fixed bug #73594 (dns_get_record does not populate $additional out parameter). - (Bruce Weirdan) + . Fixed bug #73594 (dns_get_record does not populate $additional out + parameter). (Bruce Weirdan) + . Fixed bug #70213 (Unserialize context shared on double class lookup). + (Taoguang Chen) - -- Zlib: +- Zlib . Fixed bug #73373 (deflate_add does not verify that output was not truncated). (Matt Bonneau) diff --cc ext/standard/var_unserializer.c index f3b997a,d1eb7b4..4e2bee3 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@@ -647,9 -608,9 +647,9 @@@ static int php_var_unserialize_internal yy2: ++YYCURSOR; yy3: - #line 959 "ext/standard/var_unserializer.re" -#line 922 "ext/standard/var_unserializer.re" ++#line 961 "ext/standard/var_unserializer.re" { return 0; } -#line 614 "ext/standard/var_unserializer.c" +#line 653 "ext/standard/var_unserializer.c" yy4: yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy17; @@@ -696,7 -657,7 +696,7 @@@ yy14 goto yy3; yy15: ++YYCURSOR; - #line 953 "ext/standard/var_unserializer.re" -#line 916 "ext/standard/var_unserializer.re" ++#line 955 "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"); @@@ -1274,10 -1237,10 +1276,10 @@@ yy82 return object_common2(UNSERIALIZE_PASSTHRU, elements); } - #line 1278 "ext/standard/var_unserializer.c" -#line 1241 "ext/standard/var_unserializer.c" ++#line 1280 "ext/standard/var_unserializer.c" yy84: ++YYCURSOR; -#line 704 "ext/standard/var_unserializer.re" +#line 743 "ext/standard/var_unserializer.re" { size_t len, maxlen; zend_string *str; @@@ -1311,10 -1274,10 +1313,10 @@@ ZVAL_STR(rval, str); return 1; } - #line 1315 "ext/standard/var_unserializer.c" -#line 1278 "ext/standard/var_unserializer.c" ++#line 1317 "ext/standard/var_unserializer.c" yy86: ++YYCURSOR; -#line 738 "ext/standard/var_unserializer.re" +#line 777 "ext/standard/var_unserializer.re" { zend_long elements = parse_iv(start + 2); /* use iv() not uiv() in order to check data range */ @@@ -1338,7 -1301,7 +1340,7 @@@ return finish_nested_data(UNSERIALIZE_PASSTHRU); } - #line 1342 "ext/standard/var_unserializer.c" -#line 1305 "ext/standard/var_unserializer.c" ++#line 1344 "ext/standard/var_unserializer.c" yy88: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1370,10 -1333,10 +1372,10 @@@ yy92 return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } - #line 1374 "ext/standard/var_unserializer.c" -#line 1337 "ext/standard/var_unserializer.c" ++#line 1376 "ext/standard/var_unserializer..c" yy94: ++YYCURSOR; -#line 672 "ext/standard/var_unserializer.re" +#line 711 "ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@@ -1405,7 -1368,7 +1407,7 @@@ ZVAL_STRINGL(rval, str, len); return 1; } - #line 1409 "ext/standard/var_unserializer.c" -#line 1372 "ext/standard/var_unserializer..c" ++#line 1411 "ext/standard/var_unserializer.c" yy96: yych = *++YYCURSOR; if (yych <= '/') goto yy18; @@@ -1429,9 -1392,9 +1431,9 @@@ yy97 return 1; } - #line 1433 "ext/standard/var_unserializer.c" -#line 1396 "ext/standard/var_unserializer.c" ++#line 1435 "ext/standard/var_unserializer.c" } - #line 961 "ext/standard/var_unserializer.re" -#line 924 "ext/standard/var_unserializer.re" ++#line 963 "ext/standard/var_unserializer.re" return 0;