cvs: php-src(PHP_5_2) /ext/xmlreader php_xmlreader.c /ext/xmlwriter php_xmlwriter.c

nlopess Sat Sep 16 18:18:55 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/xmlreader php_xmlreader.c /php-src/ext/xmlwriter php_xmlwriter.c Log: plug leaks that in the previous patch http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.14.2.3&r2=1.13.2.14.2.4&diff_format=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.3 php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.4 --- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.3 Sat Sep 16 18:15:25 2006 +++ php-src/ext/xmlreader/php_xmlreader.c Sat Sep 16 18:18:55 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c,v 1.13.2.14.2.3 2006/09/16 18:15:25 nlopess Exp $ */ +/* $Id: php_xmlreader.c,v 1.13.2.14.2.4 2006/09/16 18:18:55 nlopess Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -261,6 +261,7 @@ if ((uri->scheme == NULL || isFileUri)) { if (!VCWD_REALPATH(source, resolved_path) && !expand_filepath(source, resolved_path TSRMLS_CC)) { + xmlFreeURI(uri); return NULL; } file_dest = resolved_path; http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.4&r2=1.20.2.12.2.5&diff_format=u Index: php-src/ext/xmlwriter/php_xmlwriter.c diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.4 php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.5 --- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.4 Sat Sep 16 18:15:25 2006 +++ php-src/ext/xmlwriter/php_xmlwriter.c Sat Sep 16 18:18:55 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlwriter.c,v 1.20.2.12.2.4 2006/09/16 18:15:25 nlopess Exp $ */ +/* $Id: php_xmlwriter.c,v 1.20.2.12.2.5 2006/09/16 18:18:55 nlopess Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -273,6 +273,7 @@ if ((uri->scheme == NULL || isFileUri)) { if (!VCWD_REALPATH(source, resolved_path) && !expand_filepath(source, resolved_path TSRMLS_CC)) { + xmlFreeURI(uri); return NULL; } file_dest = resolved_path;