MFB: Fixed bug #44798 (Memory leak assigning value to attribute).

diff --git a/NEWS b/NEWS
index 9255645ade7b589524ef407f841168cedf570b75..30865878bf4ad48c3b2f66d4a1c5b931bb71a7ba 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP                                                                        NEWS
   functions. (Andrey)
 - Fixed bug #44891 Memory leak using registerPHPFunctions and XSLT Variable 
   as function parameter. (Rob)
+- Fixed bug #44798 (Memory leak assigning value to attribute). (Ilia)
 
 01 May 2008, PHP 5.2.6
 - Fixed two possible crashes inside posix extension (Tony)

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index c1a030065b73eb50a27e4565d209b0c632d2756d..c0659e9f075572be808b3ccbd737444cceaf12ba 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -695,11 +695,12 @@ static zval** sxe_property_get_adr(zval *object, zval *member TSRMLS_DC) /* {{{
        convert_to_string(member);
        name = Z_STRVAL_P(member);
        node = sxe_get_element_by_name(sxe, node, &name, &type TSRMLS_CC);
-       if (!node) {
-               sxe_prop_dim_write(object, member, NULL, 1, 0, &node TSRMLS_CC);
-               type = SXE_ITER_NONE;
-               name = NULL;
+       if (node) {
+               return NULL;
        }
+       sxe_prop_dim_write(object, member, NULL, 1, 0, &node TSRMLS_CC);
+       type = SXE_ITER_NONE;
+       name = NULL;
        MAKE_STD_ZVAL(return_value);
        _node_as_zval(sxe, node, return_value, type, name, sxe->iter.nsprefix, sxe->iter.isprefix TSRMLS_CC);