helly           Sun Sep 12 08:43:05 2004 EDT

  Modified files:              
    /php-src/ext/standard       var_unserializer.re 
  Log:
  - Readd check for nested data (but correct this time)
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.31&r2=1.32&ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.31 
php-src/ext/standard/var_unserializer.re:1.32
--- php-src/ext/standard/var_unserializer.re:1.31       Sun Sep 12 08:23:16 2004
+++ php-src/ext/standard/var_unserializer.re    Sun Sep 12 08:43:05 2004
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: var_unserializer.re,v 1.31 2004/09/12 12:23:16 helly Exp $ */
+/* $Id: var_unserializer.re,v 1.32 2004/09/12 12:43:05 helly Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -217,6 +217,11 @@
                
                zval_dtor(key);
                FREE_ZVAL(key);
+
+               if (elements && *(*p-1) != ';' &&  *(*p-1) != '}') {
+                       (*p)--;
+                       return 0;
+               }
        }
 
        return 1;

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

Reply via email to