Skip to content

Commit 1a184f0

Browse files
nikicnikic
committed
Commit regenerated var_unserializer.c
1 parent f53af9a commit 1a184f0

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

‎ext/standard/var_unserializer.c

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 1.0.3 */
1+
/* Generated by re2c 1.0.1 */
22
#line 1 "ext/standard/var_unserializer.re"
33
/*
44
+----------------------------------------------------------------------+
@@ -315,7 +315,7 @@ static inline int unserialize_allowed_class(
315315
#define YYMARKER marker
316316

317317

318-
#line 325 "ext/standard/var_unserializer.re"
318+
#line 323 "ext/standard/var_unserializer.re"
319319

320320

321321

@@ -353,12 +353,12 @@ static inline zend_long parse_iv2(const unsigned char *p, const unsigned char **
353353
|| (SIZEOF_ZEND_LONG == 4
354354
&& UNEXPECTED(p - start == MAX_LENGTH_OF_LONG - 1)
355355
&& UNEXPECTED(*start > '2'))
356-
|| UNEXPECTED(result - neg > ZEND_LONG_MAX)) {
356+
|| UNEXPECTED(result > ZEND_LONG_MAX + neg)) {
357357
php_error_docref(NULL, E_WARNING, "Numerical result out of range");
358358
return (!neg) ? ZEND_LONG_MAX : ZEND_LONG_MIN;
359359
}
360360

361-
return (!neg) ? (zend_long)result : -(zend_long)result;
361+
return (zend_long) ((!neg) ? result : -result);
362362
}
363363

364364
static inline zend_long parse_iv(const unsigned char *p)
@@ -673,7 +673,7 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
673673
start = cursor;
674674

675675

676-
#line 679 "ext/standard/var_unserializer.c"
676+
#line 677 "ext/standard/var_unserializer.c"
677677
{
678678
YYCTYPE yych;
679679
static const unsigned char yybm[] = {
@@ -731,9 +731,9 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
731731
yy2:
732732
++YYCURSOR;
733733
yy3:
734-
#line 1078 "ext/standard/var_unserializer.re"
734+
#line 1076 "ext/standard/var_unserializer.re"
735735
{ return 0; }
736-
#line 739 "ext/standard/var_unserializer.c"
736+
#line 737 "ext/standard/var_unserializer.c"
737737
yy4:
738738
yych = *(YYMARKER = ++YYCURSOR);
739739
if (yych == ':') goto yy17;
@@ -780,13 +780,13 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
780780
goto yy3;
781781
yy15:
782782
++YYCURSOR;
783-
#line 1072 "ext/standard/var_unserializer.re"
783+
#line 1070 "ext/standard/var_unserializer.re"
784784
{
785785
/* this is the case where we have less data than planned */
786786
php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data");
787787
return 0; /* not sure if it should be 0 or 1 here? */
788788
}
789-
#line 792 "ext/standard/var_unserializer.c"
789+
#line 790 "ext/standard/var_unserializer.c"
790790
yy17:
791791
yych = *++YYCURSOR;
792792
if (yybm[0+yych] & 128) {
@@ -797,13 +797,13 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
797797
goto yy3;
798798
yy19:
799799
++YYCURSOR;
800-
#line 733 "ext/standard/var_unserializer.re"
800+
#line 731 "ext/standard/var_unserializer.re"
801801
{
802802
*p = YYCURSOR;
803803
ZVAL_NULL(rval);
804804
return 1;
805805
}
806-
#line 809 "ext/standard/var_unserializer.c"
806+
#line 807 "ext/standard/var_unserializer.c"
807807
yy21:
808808
yych = *++YYCURSOR;
809809
if (yych <= '/') goto yy18;
@@ -1007,7 +1007,7 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
10071007
goto yy18;
10081008
yy57:
10091009
++YYCURSOR;
1010-
#line 683 "ext/standard/var_unserializer.re"
1010+
#line 681 "ext/standard/var_unserializer.re"
10111011
{
10121012
zend_long id;
10131013

@@ -1032,7 +1032,7 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
10321032

10331033
return 1;
10341034
}
1035-
#line 1038 "ext/standard/var_unserializer.c"
1035+
#line 1036 "ext/standard/var_unserializer.c"
10361036
yy59:
10371037
yych = *++YYCURSOR;
10381038
if (yych == '"') goto yy80;
@@ -1043,22 +1043,22 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
10431043
goto yy18;
10441044
yy61:
10451045
++YYCURSOR;
1046-
#line 739 "ext/standard/var_unserializer.re"
1046+
#line 737 "ext/standard/var_unserializer.re"
10471047
{
10481048
*p = YYCURSOR;
10491049
ZVAL_FALSE(rval);
10501050
return 1;
10511051
}
1052-
#line 1055 "ext/standard/var_unserializer.c"
1052+
#line 1053 "ext/standard/var_unserializer.c"
10531053
yy63:
10541054
++YYCURSOR;
1055-
#line 745 "ext/standard/var_unserializer.re"
1055+
#line 743 "ext/standard/var_unserializer.re"
10561056
{
10571057
*p = YYCURSOR;
10581058
ZVAL_TRUE(rval);
10591059
return 1;
10601060
}
1061-
#line 1064 "ext/standard/var_unserializer.c"
1061+
#line 1062 "ext/standard/var_unserializer.c"
10621062
yy65:
10631063
++YYCURSOR;
10641064
if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
@@ -1078,7 +1078,7 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
10781078
}
10791079
yy67:
10801080
++YYCURSOR;
1081-
#line 793 "ext/standard/var_unserializer.re"
1081+
#line 791 "ext/standard/var_unserializer.re"
10821082
{
10831083
#if SIZEOF_ZEND_LONG == 4
10841084
use_double:
@@ -1087,7 +1087,7 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
10871087
ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL));
10881088
return 1;
10891089
}
1090-
#line 1093 "ext/standard/var_unserializer.c"
1090+
#line 1091 "ext/standard/var_unserializer.c"
10911091
yy69:
10921092
yych = *++YYCURSOR;
10931093
if (yych <= ',') {
@@ -1109,7 +1109,7 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
11091109
goto yy18;
11101110
yy72:
11111111
++YYCURSOR;
1112-
#line 751 "ext/standard/var_unserializer.re"
1112+
#line 749 "ext/standard/var_unserializer.re"
11131113
{
11141114
#if SIZEOF_ZEND_LONG == 4
11151115
int digits = YYCURSOR - start - 3;
@@ -1135,14 +1135,14 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
11351135
ZVAL_LONG(rval, parse_iv(start + 2));
11361136
return 1;
11371137
}
1138-
#line 1141 "ext/standard/var_unserializer.c"
1138+
#line 1139 "ext/standard/var_unserializer.c"
11391139
yy74:
11401140
yych = *++YYCURSOR;
11411141
if (yych == '"') goto yy88;
11421142
goto yy18;
11431143
yy75:
11441144
++YYCURSOR;
1145-
#line 708 "ext/standard/var_unserializer.re"
1145+
#line 706 "ext/standard/var_unserializer.re"
11461146
{
11471147
zend_long id;
11481148

@@ -1167,14 +1167,14 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
11671167

11681168
return 1;
11691169
}
1170-
#line 1173 "ext/standard/var_unserializer.c"
1170+
#line 1171 "ext/standard/var_unserializer.c"
11711171
yy77:
11721172
yych = *++YYCURSOR;
11731173
if (yych == '"') goto yy90;
11741174
goto yy18;
11751175
yy78:
11761176
++YYCURSOR;
1177-
#line 920 "ext/standard/var_unserializer.re"
1177+
#line 918 "ext/standard/var_unserializer.re"
11781178
{
11791179
size_t len, len2, len3, maxlen;
11801180
zend_long elements;
@@ -1326,10 +1326,10 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
13261326

13271327
return object_common2(UNSERIALIZE_PASSTHRU, elements);
13281328
}
1329-
#line 1332 "ext/standard/var_unserializer.c"
1329+
#line 1330 "ext/standard/var_unserializer.c"
13301330
yy80:
13311331
++YYCURSOR;
1332-
#line 842 "ext/standard/var_unserializer.re"
1332+
#line 840 "ext/standard/var_unserializer.re"
13331333
{
13341334
size_t len, maxlen;
13351335
zend_string *str;
@@ -1363,10 +1363,10 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
13631363
ZVAL_STR(rval, str);
13641364
return 1;
13651365
}
1366-
#line 1369 "ext/standard/var_unserializer.c"
1366+
#line 1367 "ext/standard/var_unserializer.c"
13671367
yy82:
13681368
++YYCURSOR;
1369-
#line 876 "ext/standard/var_unserializer.re"
1369+
#line 874 "ext/standard/var_unserializer.re"
13701370
{
13711371
zend_long elements = parse_iv(start + 2);
13721372
/* use iv() not uiv() in order to check data range */
@@ -1399,7 +1399,7 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
13991399

14001400
return finish_nested_data(UNSERIALIZE_PASSTHRU);
14011401
}
1402-
#line 1405 "ext/standard/var_unserializer.c"
1402+
#line 1403 "ext/standard/var_unserializer.c"
14031403
yy84:
14041404
yych = *++YYCURSOR;
14051405
if (yych <= '/') goto yy18;
@@ -1418,7 +1418,7 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
14181418
goto yy18;
14191419
yy88:
14201420
++YYCURSOR;
1421-
#line 909 "ext/standard/var_unserializer.re"
1421+
#line 907 "ext/standard/var_unserializer.re"
14221422
{
14231423
zend_long elements;
14241424
if (!var_hash) return 0;
@@ -1429,10 +1429,10 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
14291429
}
14301430
return object_common2(UNSERIALIZE_PASSTHRU, elements);
14311431
}
1432-
#line 1435 "ext/standard/var_unserializer.c"
1432+
#line 1433 "ext/standard/var_unserializer.c"
14331433
yy90:
14341434
++YYCURSOR;
1435-
#line 802 "ext/standard/var_unserializer.re"
1435+
#line 800 "ext/standard/var_unserializer.re"
14361436
{
14371437
size_t len, maxlen;
14381438
char *str;
@@ -1472,10 +1472,10 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
14721472
}
14731473
return 1;
14741474
}
1475-
#line 1478 "ext/standard/var_unserializer.c"
1475+
#line 1476 "ext/standard/var_unserializer.c"
14761476
yy92:
14771477
++YYCURSOR;
1478-
#line 777 "ext/standard/var_unserializer.re"
1478+
#line 775 "ext/standard/var_unserializer.re"
14791479
{
14801480
*p = YYCURSOR;
14811481

@@ -1491,9 +1491,9 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
14911491

14921492
return 1;
14931493
}
1494-
#line 1497 "ext/standard/var_unserializer.c"
1494+
#line 1495 "ext/standard/var_unserializer.c"
14951495
}
1496-
#line 1080 "ext/standard/var_unserializer.re"
1496+
#line 1078 "ext/standard/var_unserializer.re"
14971497

14981498

14991499
return 0;

0 commit comments

Comments
 (0)