sniper Tue Mar 1 18:26:11 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard var_unserializer.c
Log:
update
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.38.2.11&r2=1.38.2.12&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.38.2.11
php-src/ext/standard/var_unserializer.c:1.38.2.12
--- php-src/ext/standard/var_unserializer.c:1.38.2.11 Mon Feb 14 16:03:52 2005
+++ php-src/ext/standard/var_unserializer.c Tue Mar 1 18:26:08 2005
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.9.4 on Mon Feb 14 22:03:31 2005 */
-#line 1 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+/* Generated by re2c 0.9.4 on Wed Mar 2 01:25:31 2005 */
+#line 1 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.38.2.11 2005/02/14 21:03:52 helly Exp $ */
+/* $Id: var_unserializer.c,v 1.38.2.12 2005/03/01 23:26:08 sniper Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -147,7 +147,7 @@
#define YYMARKER marker
-#line 154 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 154 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
@@ -420,7 +420,7 @@
if(yych == ':') goto yy87;
goto yy4;
yy4:
-#line 581 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 585 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
{ return 0; }
#line 102 "<stdout>"
yy5: yyaccept = 0;
@@ -461,7 +461,7 @@
yy14: ++YYCURSOR;
goto yy15;
yy15:
-#line 575 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 579 "/usr/src/php/php_5_0/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");
@@ -490,7 +490,7 @@
yy22: ++YYCURSOR;
goto yy23;
yy23:
-#line 475 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 479 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
{
size_t len, len2, len3, maxlen;
int elements;
@@ -619,7 +619,7 @@
yy29: ++YYCURSOR;
goto yy30;
yy30:
-#line 467 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 471 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
{
INIT_PZVAL(*rval);
@@ -651,12 +651,16 @@
yy36: ++YYCURSOR;
goto yy37;
yy37:
-#line 449 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 449 "/usr/src/php/php_5_0/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));
@@ -669,7 +673,7 @@
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
-#line 352 "<stdout>"
+#line 356 "<stdout>"
yy38: yych = *++YYCURSOR;
if(yych == '+') goto yy39;
if(yych <= '/') goto yy2;
@@ -693,7 +697,7 @@
yy43: ++YYCURSOR;
goto yy44;
yy44:
-#line 421 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 421 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -721,7 +725,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
}
-#line 405 "<stdout>"
+#line 409 "<stdout>"
yy45: yych = *++YYCURSOR;
if(yych <= '/'){
if(yych <= ','){
@@ -810,14 +814,14 @@
yy55: ++YYCURSOR;
goto yy56;
yy56:
-#line 414 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 414 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_DOUBLE(*rval, zend_strtod(start + 2, NULL));
return 1;
}
-#line 503 "<stdout>"
+#line 507 "<stdout>"
yy57: yych = *++YYCURSOR;
if(yych <= ','){
if(yych != '+') goto yy2;
@@ -877,7 +881,7 @@
yy66: ++YYCURSOR;
goto yy67;
yy67:
-#line 399 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 399 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -892,7 +896,7 @@
return 1;
}
-#line 580 "<stdout>"
+#line 584 "<stdout>"
yy68: yych = *++YYCURSOR;
if(yych == 'N') goto yy65;
goto yy2;
@@ -921,14 +925,14 @@
yy73: ++YYCURSOR;
goto yy74;
yy74:
-#line 392 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 392 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
}
-#line 617 "<stdout>"
+#line 621 "<stdout>"
yy75: yych = *++YYCURSOR;
if(yych <= '/') goto yy2;
if(yych >= '2') goto yy2;
@@ -939,25 +943,25 @@
yy77: ++YYCURSOR;
goto yy78;
yy78:
-#line 385 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 385 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
}
-#line 635 "<stdout>"
+#line 639 "<stdout>"
yy79: ++YYCURSOR;
goto yy80;
yy80:
-#line 378 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 378 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_NULL(*rval);
return 1;
}
-#line 646 "<stdout>"
+#line 650 "<stdout>"
yy81: yych = *++YYCURSOR;
if(yych <= ','){
if(yych != '+') goto yy2;
@@ -983,7 +987,7 @@
yy85: ++YYCURSOR;
goto yy86;
yy86:
-#line 355 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 355 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
{
int id;
@@ -1006,7 +1010,7 @@
return 1;
}
-#line 696 "<stdout>"
+#line 700 "<stdout>"
yy87: yych = *++YYCURSOR;
if(yych <= ','){
if(yych != '+') goto yy2;
@@ -1032,7 +1036,7 @@
yy91: ++YYCURSOR;
goto yy92;
yy92:
-#line 334 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 334 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
{
int id;
@@ -1053,9 +1057,9 @@
return 1;
}
-#line 744 "<stdout>"
+#line 748 "<stdout>"
}
-#line 583 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re"
+#line 587 "/usr/src/php/php_5_0/ext/standard/var_unserializer.re"
return 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
