com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/standard/ var_unserializer.c ext/standard/var_unserializer.re
| From: | Anatol Belski | Date: | Tue, 04 Jul 2017 08:42:48 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/standard/ var_unserializer.c ext/standard/var_unserializer.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98311@lists.php.net to get a copy of this message | ||
Commit: 2dc24005d9fe1827705276cec52397a57ae66549
Author: Anatol Belski <ab@php.net> Tue, 4 Jul 2017 10:42:48 +0200
Parents: 9d1575c4956cd0018ae0a8f7f393600a1de1f05a d02f953faf4afdd1576acb1380e4cd3c050ac599
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2dc24005d9fe1827705276cec52397a57ae66549
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74101 and bug #74614
Bugs:
https://bugs.php.net/74101
https://bugs.php..net/74614
Changed paths:
MM ext/standard/var_unserializer.c
MM ext/standard/var_unserializer.re
Diff:
diff --cc ext/standard/var_unserializer.c
index 609ed45,a1a190b..ac024fd
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@@ -617,7 -582,7 +621,7 @@@ static int php_var_unserialize_internal
start = cursor;
- #line 621 "ext/standard/var_unserializer.c"
-#line 586 "ext/standard/var_unserializer.c"
++#line 625 "ext/standard/var_unserializer.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
@@@ -675,9 -640,9 +679,9 @@@
yy2:
++YYCURSOR;
yy3:
- #line 998 "ext/standard/var_unserializer.re"
-#line 963 "ext/standard/var_unserializer.re"
++#line 1002 "ext/standard/var_unserializer.re"
{ return 0; }
- #line 681 "ext/standard/var_unserializer.c"
-#line 646 "ext/standard/var_unserializer.c"
++#line 685 "ext/standard/var_unserializer.c"
yy4:
yych = *(YYMARKER = ++YYCURSOR);
if (yych == ':') goto yy17;
@@@ -724,13 -689,13 +728,13 @@@ yy14
goto yy3;
yy15:
++YYCURSOR;
- #line 992 "ext/standard/var_unserializer.re"
-#line 957 "ext/standard/var_unserializer.re"
++#line 996 "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 734 "ext/standard/var_unserializer.c"
-#line 699 "ext/standard/var_unserializer.c"
++#line 738 "ext/standard/var_unserializer.c"
yy17:
yych = *++YYCURSOR;
if (yybm[0+yych] & 128) {
@@@ -742,13 -707,13 +746,13 @@@ yy18
goto yy3;
yy19:
++YYCURSOR;
- #line 676 "ext/standard/var_unserializer.re"
-#line 641 "ext/standard/var_unserializer.re"
++#line 680 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
ZVAL_NULL(rval);
return 1;
}
- #line 752 "ext/standard/var_unserializer.c"
-#line 717 "ext/standard/var_unserializer.c"
++#line 756 "ext/standard/var_unserializer.c"
yy21:
yych = *++YYCURSOR;
if (yych <= ',') {
@@@ -998,7 -963,7 +1002,7 @@@ yy62
goto yy18;
yy63:
++YYCURSOR;
- #line 625 "ext/standard/var_unserializer.re"
-#line 590 "ext/standard/var_unserializer.re"
++#line 629 "ext/standard/var_unserializer.re"
{
zend_long id;
@@@ -1024,7 -989,7 +1028,7 @@@
return 1;
}
- #line 1028 "ext/standard/var_unserializer.c"
-#line 993 "ext/standard/var_unserializer..c"
++#line 1032 "ext/standard/var_unserializer.c"
yy65:
yych = *++YYCURSOR;
if (yych == '"') goto yy84;
@@@ -1035,13 -1000,13 +1039,13 @@@ yy66
goto yy18;
yy67:
++YYCURSOR;
- #line 682 "ext/standard/var_unserializer.re"
-#line 647 "ext/standard/var_unserializer.re"
++#line 686 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
ZVAL_BOOL(rval, parse_iv(start + 2));
return 1;
}
- #line 1045 "ext/standard/var_unserializer.c"
-#line 1010 "ext/standard/var_unserializer.c"
++#line 1049 "ext/standard/var_unserializer.c"
yy69:
++YYCURSOR;
if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
@@@ -1061,7 -1026,7 +1065,7 @@@
}
yy71:
++YYCURSOR;
- #line 730 "ext/standard/var_unserializer.re"
-#line 695 "ext/standard/var_unserializer.re"
++#line 734 "ext/standard/var_unserializer.re"
{
#if SIZEOF_ZEND_LONG == 4
use_double:
@@@ -1070,7 -1035,7 +1074,7 @@@
ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL));
return 1;
}
- #line 1074 "ext/standard/var_unserializer.c"
-#line 1039 "ext/standard/var_unserializer.c"
++#line 1078 "ext/standard/var_unserializer.c"
yy73:
yych = *++YYCURSOR;
if (yych <= ',') {
@@@ -1092,7 -1057,7 +1096,7 @@@ yy75
goto yy18;
yy76:
++YYCURSOR;
- #line 688 "ext/standard/var_unserializer.re"
-#line 653 "ext/standard/var_unserializer.re"
++#line 692 "ext/standard/var_unserializer.re"
{
#if SIZEOF_ZEND_LONG == 4
int digits = YYCURSOR - start - 3;
@@@ -1118,14 -1083,14 +1122,14 @@@
ZVAL_LONG(rval, parse_iv(start + 2));
return 1;
}
- #line 1122 "ext/standard/var_unserializer.c"
-#line 1087 "ext/standard/var_unserializer.c"
++#line 1126 "ext/standard/var_unserializer.c"
yy78:
yych = *++YYCURSOR;
if (yych == '"') goto yy92;
goto yy18;
yy79:
++YYCURSOR;
- #line 651 "ext/standard/var_unserializer.re"
-#line 616 "ext/standard/var_unserializer.re"
++#line 655 "ext/standard/var_unserializer.re"
{
zend_long id;
@@@ -1150,14 -1115,14 +1154,14 @@@
return 1;
}
- #line 1154 "ext/standard/var_unserializer.c"
-#line 1119 "ext/standard/var_unserializer.c"
++#line 1158 "ext/standard/var_unserializer..c"
yy81:
yych = *++YYCURSOR;
if (yych == '"') goto yy94;
goto yy18;
yy82:
++YYCURSOR;
- #line 840 "ext/standard/var_unserializer.re"
-#line 805 "ext/standard/var_unserializer.re"
++#line 844 "ext/standard/var_unserializer.re"
{
size_t len, len2, len3, maxlen;
zend_long elements;
@@@ -1309,10 -1274,10 +1313,10 @@@
return object_common2(UNSERIALIZE_PASSTHRU, elements);
}
- #line 1313 "ext/standard/var_unserializer.c"
-#line 1278 "ext/standard/var_unserializer.c"
++#line 1317 "ext/standard/var_unserializer.c"
yy84:
++YYCURSOR;
- #line 771 "ext/standard/var_unserializer.re"
-#line 736 "ext/standard/var_unserializer.re"
++#line 775 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
zend_string *str;
@@@ -1346,10 -1311,10 +1350,10 @@@
ZVAL_STR(rval, str);
return 1;
}
- #line 1350 "ext/standard/var_unserializer.c"
-#line 1315 "ext/standard/var_unserializer.c"
++#line 1354 "ext/standard/var_unserializer.c"
yy86:
++YYCURSOR;
- #line 805 "ext/standard/var_unserializer.re"
-#line 770 "ext/standard/var_unserializer.re"
++#line 809 "ext/standard/var_unserializer.re"
{
zend_long elements = parse_iv(start + 2);
/* use iv() not uiv() in order to check data range */
@@@ -1373,7 -1338,7 +1377,7 @@@
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
- #line 1377 "ext/standard/var_unserializer.c"
-#line 1342 "ext/standard/var_unserializer.c"
++#line 1381 "ext/standard/var_unserializer.c"
yy88:
yych = *++YYCURSOR;
if (yych <= ',') {
@@@ -1398,7 -1363,7 +1402,7 @@@ yy91
goto yy18;
yy92:
++YYCURSOR;
- #line 829 "ext/standard/var_unserializer.re"
-#line 794 "ext/standard/var_unserializer.re"
++#line 833 "ext/standard/var_unserializer.re"
{
long elements;
if (!var_hash) return 0;
@@@ -1409,10 -1374,10 +1413,10 @@@
}
return object_common2(UNSERIALIZE_PASSTHRU, elements);
}
- #line 1413 "ext/standard/var_unserializer.c"
-#line 1378 "ext/standard/var_unserializer.c"
++#line 1417 "ext/standard/var_unserializer..c"
yy94:
++YYCURSOR;
- #line 739 "ext/standard/var_unserializer.re"
-#line 704 "ext/standard/var_unserializer.re"
++#line 743 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@@ -1444,7 -1409,7 +1448,7 @@@
ZVAL_STRINGL(rval, str, len);
return 1;
}
- #line 1448 "ext/standard/var_unserializer.c"
-#line 1413 "ext/standard/var_unserializer.c"
++#line 1452 "ext/standard/var_unserializer.c"
yy96:
yych = *++YYCURSOR;
if (yych <= '/') goto yy18;
@@@ -1452,7 -1417,7 +1456,7 @@@
goto yy18;
yy97:
++YYCURSOR;
- #line 714 "ext/standard/var_unserializer.re"
-#line 679 "ext/standard/var_unserializer.re"
++#line 718 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
@@@ -1468,9 -1433,9 +1472,9 @@@
return 1;
}
- #line 1472 "ext/standard/var_unserializer.c"
-#line 1437 "ext/standard/var_unserializer.c"
++#line 1476 "ext/standard/var_unserializer.c"
}
- #line 1000 "ext/standard/var_unserializer.re"
-#line 965 "ext/standard/var_unserializer.re"
++#line 1004 "ext/standard/var_unserializer.re"
return 0;