Hi Tony,
I spent the last three days merging all three branches of the phar
extension. Please can you revert these two commits until that's in, as there
_will_ be merge conflicts otherwise!
Thanks,
- Steph
----- Original Message -----
From: "Antony Dovgal" <[EMAIL PROTECTED]>
To: <php-cvs@lists.php.net>
Sent: Tuesday, July 29, 2008 12:09 PM
Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar util.c
tony2001 Tue Jul 29 11:09:00 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar util.c
Log:
don't free function name before calling the function
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.25&r2=1.55.2.26&diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.25
php-src/ext/phar/util.c:1.55.2.26
--- php-src/ext/phar/util.c:1.55.2.25 Tue Jul 29 10:52:08 2008
+++ php-src/ext/phar/util.c Tue Jul 29 11:09:00 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: util.c,v 1.55.2.25 2008/07/29 10:52:08 tony2001 Exp $ */
+/* $Id: util.c,v 1.55.2.26 2008/07/29 11:09:00 tony2001 Exp $ */
#include "phar_internal.h"
@@ -1510,10 +1510,9 @@
zval_dtor(zsig);
zval_dtor(zkey);
zval_dtor(openssl);
+ efree(openssl);
return FAILURE;
}
- zval_dtor(openssl);
- efree(openssl);
fci.param_count = 3;
fci.params = zp;
@@ -1536,11 +1535,16 @@
zval_dtor(zdata);
zval_dtor(zsig);
zval_dtor(zkey);
+ zval_dtor(openssl);
+ efree(openssl);
efree(zdata);
efree(zkey);
efree(zsig);
return FAILURE;
}
+ zval_dtor(openssl);
+ efree(openssl);
+
#if PHP_VERSION_ID < 50300
--(zdata->refcount);
--(zsig->refcount);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
