cvs: php-src /ext/standard var_unserializer.re
| From: | Marcus Boerger | Date: | Sun, 12 Sep 2004 12:23:16 +0000 |
| Subject: | cvs: php-src /ext/standard var_unserializer.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-28653@lists.php.net to get a copy of this message | ||
helly Sun Sep 12 08:23:16 2004 EDT
Modified files:
/php-src/ext/standard var_unserializer.re
Log:
- Check for legal key types
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.30&r2=1.31&ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.30 php-src/ext/standard/var_unserializer.re:1.31
--- php-src/ext/standard/var_unserializer.re:1.30 Sun Sep 12 07:50:45 2004
+++ php-src/ext/standard/var_unserializer.re Sun Sep 12 08:23:16 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.re,v 1.30 2004/09/12 11:50:45 helly Exp $ */
+/* $Id: var_unserializer.re,v 1.31 2004/09/12 12:23:16 helly Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -207,7 +207,12 @@
case IS_STRING:
zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break;
-
+ default:
+ zval_dtor(key);
+ FREE_ZVAL(key);
+ zval_dtor(data);
+ FREE_ZVAL(data);
+ return 0;
}
zval_dtor(key);