- Remove wrong test

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index e9f9b545ed6004a7e734ed1399bc61cfeaad8bf8..6dbad500a485e5098be03fed6949adb86a4f6ca0 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -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"
 /*
   +----------------------------------------------------------------------+
@@ -209,14 +209,6 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, int
                
                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 @@ yy3:        yyaccept = 0;
        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 @@ yy13:       yyaccept = 0;
 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 @@ yy21:       yych = *++YYCURSOR;
 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 @@ yy28:       yych = *++YYCURSOR;
 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 @@ yy35:       yych = *++YYCURSOR;
 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 @@ yy42:       yych = *++YYCURSOR;
 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 @@ yy54:       if(yych <= ';'){
 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 @@ yy65:       yych = *++YYCURSOR;
 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 @@ yy72:       if(yych <= '/') goto yy2;
 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 @@ yy76:       yych = *++YYCURSOR;
 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 @@ yy78:
 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 @@ yy84:       if(yych <= '/') goto yy2;
 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 @@ yy90:       if(yych <= '/') goto yy2;
 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 @@ yy92:
 }
 #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;

diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 8839cf5d6f1d469ae63e1781a004c63d573ec50d..531fcef8c88abe4528a76b32ee74d33a1c2473f4 100644 (file)
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -212,14 +212,6 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, int
                
                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;