[PHP-CVS] cvs: php-src /ext/standard var_unserializer.c

[Stanislav Malyshev]

stas            Tue Aug  5 05:23:17 2003 EDT

  Modified files:              
    /php-src/ext/standard       var_unserializer.c 
  Log:
  syncronize
  
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.28 
php-src/ext/standard/var_unserializer.c:1.29
--- php-src/ext/standard/var_unserializer.c:1.28        Wed Jul  2 12:19:57 2003
+++ php-src/ext/standard/var_unserializer.c     Tue Aug  5 05:23:17 2003
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Thu Jul  3 01:22:57 2003 */
-#line 1 "/home/koizumi/src/php-src-5/ext/standard/var_unserializer.re"
+/* Generated by re2c 0.5 on Tue Aug  5 12:19:02 2003 */
+#line 1 "/home/frodo/php5/ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
   | PHP Version 4                                                        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: var_unserializer.c,v 1.28 2003/07/02 16:19:57 moriyoshi Exp $ */
+/* $Id: var_unserializer.c,v 1.29 2003/08/05 09:23:17 stas Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -224,9 +224,11 @@
                return 0;
        }
 
-       INIT_PZVAL(&fname);
-       ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1, 0);
-       call_user_function_ex(CG(function_table), rval, &fname, &retval_ptr, 0, 0, 1, 
NULL TSRMLS_CC);
+       if(Z_OBJCE_PP(rval) != PHP_IC_ENTRY) {
+               INIT_PZVAL(&fname);
+               ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1, 0);
+               call_user_function_ex(CG(function_table), rval, &fname, &retval_ptr, 
0, 0, 1, NULL TSRMLS_CC);
+       }
 
        if (retval_ptr)
                zval_ptr_dtor(&retval_ptr);
@@ -339,7 +341,7 @@
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych == ':') goto yy74;
 yy4:
-#line 443
+#line 445
        { return 0; }
 yy5:   yych = *++YYCURSOR;
        if(yych == ';') goto yy72;
@@ -374,7 +376,7 @@
        goto yy4;
 yy13:  yych = *++YYCURSOR;
 yy14:
-#line 437
+#line 439
        {
        /* this is the case where we have less data than planned */
        php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized 
data");
@@ -398,7 +400,7 @@
        if(yych != '"') goto yy2;
 yy21:  yych = *++YYCURSOR;
 yy22:
-#line 352
+#line 354
        {
        int len;
        int elements;
@@ -505,7 +507,7 @@
        if(yych != '"') goto yy2;
 yy28:  yych = *++YYCURSOR;
 yy29:
-#line 344
+#line 346
        {
 
        INIT_PZVAL(*rval);
@@ -535,7 +537,7 @@
        if(yych != '{') goto yy2;
 yy35:  yych = *++YYCURSOR;
 yy36:
-#line 326
+#line 328
        {
        int elements = parse_iv(start + 2);
 
@@ -575,7 +577,7 @@
        if(yych != '"') goto yy2;
 yy42:  yych = *++YYCURSOR;
 yy43:
-#line 306
+#line 308
        {
        int len;
        char *str;
@@ -652,7 +654,7 @@
        }
 yy51:  yych = *++YYCURSOR;
 yy52:
-#line 299
+#line 301
        {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -725,7 +727,7 @@
        if(yych != ';') goto yy2;
 yy64:  yych = *++YYCURSOR;
 yy65:
-#line 292
+#line 294
        {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -752,7 +754,7 @@
        if(yych != ';') goto yy2;
 yy70:  yych = *++YYCURSOR;
 yy71:
-#line 285
+#line 287
        {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -761,7 +763,7 @@
 }
 yy72:  yych = *++YYCURSOR;
 yy73:
-#line 278
+#line 280
        {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -788,7 +790,7 @@
        if(yych != ';') goto yy2;
 yy78:  yych = *++YYCURSOR;
 yy79:
-#line 257
+#line 259
        {
        int id;
 
@@ -810,7 +812,7 @@
        return 1;
 }
 }
-#line 445
+#line 447
 
 
        return 0;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php