dmitry Wed Jul 9 08:47:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar_object.c
Log:
Fixed efree(NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.33&r2=1.266.2.34&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.33
php-src/ext/phar/phar_object.c:1.266.2.34
--- php-src/ext/phar/phar_object.c:1.266.2.33 Mon Jul 7 01:11:07 2008
+++ php-src/ext/phar/phar_object.c Wed Jul 9 08:47:05 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_object.c,v 1.266.2.33 2008/07/07 01:11:07 sfox Exp $ */
+/* $Id: phar_object.c,v 1.266.2.34 2008/07/09 08:47:05 dmitry Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -3884,12 +3884,12 @@
}
fp = php_stream_open_wrapper(phar_obj->arc.archive->fname, "rb",
IGNORE_URL|STREAM_MUST_SEEK, &actual);
- efree(actual);
if (!fp) {
zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0
TSRMLS_CC,
"Invalid argument, %s cannot be found",
phar_obj->arc.archive->fname);
return;
}
+ efree(actual);
php_stream_close(fp);
if (pathto_len < 1) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
