helly Sun Sep 12 07:51:13 2004 EDT
Modified files:
/php-src/ext/standard var_unserializer.c
Log:
- Remove wrong test
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.41&r2=1.42&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.41
php-src/ext/standard/var_unserializer.c:1.42
--- php-src/ext/standard/var_unserializer.c:1.41 Sun Sep 5 13:44:15 2004
+++ php-src/ext/standard/var_unserializer.c Sun Sep 12 07:51:13 2004
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.4 on Sun Sep 5 19:19:02 2004 */
+/* Generated by re2c 0.9.4 on Sun Sep 12 13:42:52 2004 */
#line 1 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.41 2004/09/05 17:44:15 helly Exp $ */
+/* $Id: var_unserializer.c,v 1.42 2004/09/12 11:51:13 helly Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -209,14 +209,6 @@
zval_dtor(key);
FREE_ZVAL(key);
-
- if (elements && *(*p-1) != ';') {
-#if SOMETHING_NEW_MIGHT_LEAD_TO_CRASH_ENABLE_IF_YOU_ARE_BRAVE
- zval_ptr_dtor(rval);
-#endif
- (*p)--;
- return 0;
- }
}
return 1;
@@ -376,7 +368,7 @@
if(yych == ':') goto yy87;
goto yy4;
yy4:
-#line 530 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 522 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{ return 0; }
#line 102 "<stdout>"
yy5: yyaccept = 0;
@@ -417,7 +409,7 @@
yy14: ++YYCURSOR;
goto yy15;
yy15:
-#line 524 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 516 "/usr/src/php-cvs/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");
@@ -446,7 +438,7 @@
yy22: ++YYCURSOR;
goto yy23;
yy23:
-#line 431 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 423 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{
size_t len, len2, maxlen;
int elements;
@@ -568,7 +560,7 @@
yy29: ++YYCURSOR;
goto yy30;
yy30:
-#line 423 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 415 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{
INIT_PZVAL(*rval);
@@ -600,7 +592,7 @@
yy36: ++YYCURSOR;
goto yy37;
yy37:
-#line 405 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 397 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{
int elements = parse_iv(start + 2);
@@ -642,7 +634,7 @@
yy43: ++YYCURSOR;
goto yy44;
yy44:
-#line 377 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 369 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -759,7 +751,7 @@
yy55: ++YYCURSOR;
goto yy56;
yy56:
-#line 370 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 362 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -826,7 +818,7 @@
yy66: ++YYCURSOR;
goto yy67;
yy67:
-#line 353 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 345 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -872,7 +864,7 @@
yy73: ++YYCURSOR;
goto yy74;
yy74:
-#line 346 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 338 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -890,7 +882,7 @@
yy77: ++YYCURSOR;
goto yy78;
yy78:
-#line 339 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 331 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -901,7 +893,7 @@
yy79: ++YYCURSOR;
goto yy80;
yy80:
-#line 332 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 324 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -934,7 +926,7 @@
yy85: ++YYCURSOR;
goto yy86;
yy86:
-#line 311 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 303 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{
int id;
@@ -981,7 +973,7 @@
yy91: ++YYCURSOR;
goto yy92;
yy92:
-#line 290 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 282 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
{
int id;
@@ -1004,7 +996,7 @@
}
#line 737 "<stdout>"
}
-#line 532 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 524 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
return 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
