[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c trunk/ext/xmlrpc/xmlrpc-epi-php.c

[Felipe Pena]

felipe                                   Sat, 13 Mar 2010 20:26:51 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=296153

Log:
- Fix mem. leak

Changed paths:
    U   php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c
    U   php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c
    U   php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c

Modified: php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c    2010-03-13 
18:40:29 UTC (rev 296152)
+++ php/php-src/branches/PHP_5_2/ext/xmlrpc/xmlrpc-epi-php.c    2010-03-13 
20:26:51 UTC (rev 296153)
@@ -740,7 +740,8 @@
                                        Z_TYPE_P(method_name_out) = IS_STRING;
                                        Z_STRVAL_P(method_name_out) = 
estrdup(method_name);
                                        Z_STRLEN_P(method_name_out) = 
strlen(Z_STRVAL_P(method_name_out));
-                               } else {
+                               } else if (retval) {
+                                       zval_ptr_dtor(&retval);
                                        retval = NULL;
                                }
                        }

Modified: php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c    2010-03-13 
18:40:29 UTC (rev 296152)
+++ php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c    2010-03-13 
20:26:51 UTC (rev 296153)
@@ -795,7 +795,8 @@
                                        Z_TYPE_P(method_name_out) = IS_STRING;
                                        Z_STRVAL_P(method_name_out) = 
estrdup(method_name);
                                        Z_STRLEN_P(method_name_out) = 
strlen(Z_STRVAL_P(method_name_out));
-                               } else {
+                               } else if (retval) {
+                                       zval_ptr_dtor(&retval);
                                        retval = NULL;
                                }
                        }

Modified: php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c
===================================================================
--- php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c       2010-03-13 18:40:29 UTC 
(rev 296152)
+++ php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c       2010-03-13 20:26:51 UTC 
(rev 296153)
@@ -801,7 +801,8 @@
                                        Z_TYPE_P(method_name_out) = IS_STRING;
                                        Z_STRVAL_P(method_name_out) = 
estrdup(method_name);
                                        Z_STRLEN_P(method_name_out) = 
strlen(Z_STRVAL_P(method_name_out));
-                               } else {
+                               } else if (retval) {
+                                       zval_ptr_dtor(&retval);
                                        retval = NULL;
                                }
                        }


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