cvs: php-src /ext/simplexml simplexml.c
| From: | Marcus Boerger | Date: | Mon, 27 Feb 2006 11:55:24 +0000 |
| Subject: | cvs: php-src /ext/simplexml simplexml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-37044@lists.php.net to get a copy of this message | ||
helly Mon Feb 27 11:55:24 2006 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
- MFB
http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.193&r2=1.194&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.193 php-src/ext/simplexml/simplexml.c:1.194
--- php-src/ext/simplexml/simplexml.c:1.193 Sun Feb 26 16:12:21 2006
+++ php-src/ext/simplexml/simplexml.c Mon Feb 27 11:55:23 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.193 2006/02/26 16:12:21 helly Exp $ */
+/* $Id: simplexml.c,v 1.194 2006/02/27 11:55:23 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -331,6 +331,10 @@
if (member == &tmp_zv) {
zval_dtor(&tmp_zv);
}
+ if (Z_TYPE_P(return_value) == IS_NULL) {
+ FREE_ZVAL(return_value);
+ return_value = &EG(uninitialized_zval);
+ }
return return_value;
}
@@ -2113,7 +2117,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.193 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.194 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");