From d8f6c856af5200d4b81d489ec25659912994fc70 Mon Sep 17 00:00:00 2001 From: foobar Date: Tue, 1 Mar 2005 21:56:40 +0000 Subject: [PATCH] touch --- ext/standard/var_unserializer.c | 56 ++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index fe91f7cb55..cdf6ca5c8a 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,5 +1,5 @@ -/* Generated by re2c 0.9.4 on Tue Feb 15 09:07:53 2005 */ -#line 1 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +/* Generated by re2c 0.9.4 on Tue Mar 1 23:56:03 2005 */ +#line 1 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ | PHP Version 4 | @@ -147,7 +147,7 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) #define YYMARKER marker -#line 154 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 154 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" @@ -432,7 +432,7 @@ yy3: yyaccept = 0; if(yych == ':') goto yy87; goto yy4; yy4: -#line 582 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 586 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { return 0; } #line 102 "" yy5: yyaccept = 0; @@ -473,7 +473,7 @@ yy13: yyaccept = 0; yy14: ++YYCURSOR; goto yy15; yy15: -#line 576 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 580 "/usr/src/php/php_4_3/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"); @@ -502,7 +502,7 @@ yy21: yych = *++YYCURSOR; yy22: ++YYCURSOR; goto yy23; yy23: -#line 487 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 491 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { size_t len, len2, len3, maxlen; int elements; @@ -620,7 +620,7 @@ yy28: yych = *++YYCURSOR; yy29: ++YYCURSOR; goto yy30; yy30: -#line 479 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 483 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { INIT_PZVAL(*rval); @@ -652,12 +652,16 @@ yy35: yych = *++YYCURSOR; yy36: ++YYCURSOR; goto yy37; yy37: -#line 461 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 461 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { int elements = parse_iv(start + 2); *p = YYCURSOR; + if (elements < 0) { + return 0; + } + INIT_PZVAL(*rval); Z_TYPE_PP(rval) = IS_ARRAY; ALLOC_HASHTABLE(Z_ARRVAL_PP(rval)); @@ -670,7 +674,7 @@ yy37: return finish_nested_data(UNSERIALIZE_PASSTHRU); } -#line 341 "" +#line 345 "" yy38: yych = *++YYCURSOR; if(yych == '+') goto yy39; if(yych <= '/') goto yy2; @@ -694,7 +698,7 @@ yy42: yych = *++YYCURSOR; yy43: ++YYCURSOR; goto yy44; yy44: -#line 433 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 433 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@ -722,7 +726,7 @@ yy44: ZVAL_STRINGL(*rval, str, len, 1); return 1; } -#line 394 "" +#line 398 "" yy45: yych = *++YYCURSOR; if(yych <= '/'){ if(yych <= ','){ @@ -811,14 +815,14 @@ yy54: if(yych <= ';'){ yy55: ++YYCURSOR; goto yy56; yy56: -#line 426 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 426 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_DOUBLE(*rval, zend_strtod(start + 2, NULL)); return 1; } -#line 492 "" +#line 496 "" yy57: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy2; @@ -878,7 +882,7 @@ yy65: yych = *++YYCURSOR; yy66: ++YYCURSOR; goto yy67; yy67: -#line 411 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 411 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -893,7 +897,7 @@ yy67: return 1; } -#line 569 "" +#line 573 "" yy68: yych = *++YYCURSOR; if(yych == 'N') goto yy65; goto yy2; @@ -922,14 +926,14 @@ yy72: if(yych <= '/') goto yy2; yy73: ++YYCURSOR; goto yy74; yy74: -#line 404 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 404 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_LONG(*rval, parse_iv(start + 2)); return 1; } -#line 606 "" +#line 610 "" yy75: yych = *++YYCURSOR; if(yych <= '/') goto yy2; if(yych >= '2') goto yy2; @@ -940,25 +944,25 @@ yy76: yych = *++YYCURSOR; yy77: ++YYCURSOR; goto yy78; yy78: -#line 397 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 397 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_BOOL(*rval, parse_iv(start + 2)); return 1; } -#line 624 "" +#line 628 "" yy79: ++YYCURSOR; goto yy80; yy80: -#line 390 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 390 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_NULL(*rval); return 1; } -#line 635 "" +#line 639 "" yy81: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy2; @@ -984,7 +988,7 @@ yy84: if(yych <= '/') goto yy2; yy85: ++YYCURSOR; goto yy86; yy86: -#line 367 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 367 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { int id; @@ -1007,7 +1011,7 @@ yy86: return 1; } -#line 685 "" +#line 689 "" yy87: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy2; @@ -1033,7 +1037,7 @@ yy90: if(yych <= '/') goto yy2; yy91: ++YYCURSOR; goto yy92; yy92: -#line 346 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 346 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" { int id; @@ -1054,9 +1058,9 @@ yy92: return 1; } -#line 733 "" +#line 737 "" } -#line 584 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" +#line 588 "/usr/src/php/php_4_3/ext/standard/var_unserializer.re" return 0; -- 2.50.1