What exactly was merged to fix/change/what?
HEAD has the log now with just 'MFB'..wtf?
Please, follow the rules..
--Jani
Marcus Boerger [EMAIL PROTECTED] kirjoitti:
helly Tue Aug 12 15:37:36 2008 UTC
Modified files:
/php-src/ext/phar func_interceptors.c
Log:
- MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.23
php-src/ext/phar/func_interceptors.c:1.24
--- php-src/ext/phar/func_interceptors.c:1.23 Fri Aug 1 13:45:05 2008
+++ php-src/ext/phar/func_interceptors.c Tue Aug 12 15:37:36 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: func_interceptors.c,v 1.23 2008/08/01 13:45:05 sfox Exp $ */
+/* $Id: func_interceptors.c,v 1.24 2008/08/12 15:37:36 helly Exp $ */
#include "phar_internal.h"
@@ -950,7 +950,9 @@
}
}
}
- efree(entry);
+ if (entry != filename) {
+ efree(entry);
+ }
efree(arch);
RETURN_FALSE;
}
--
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
