cvs: php-src /ext/filter callback_filter.c
| From: | Nuno Lopes | Date: | Thu, 09 Nov 2006 16:34:00 +0000 |
| Subject: | cvs: php-src /ext/filter callback_filter.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41419@lists.php.net to get a copy of this message | ||
nlopess Thu Nov 9 16:34:00 2006 UTC
Modified files:
/php-src/ext/filter callback_filter.c
Log:
MFB: fix possible segfault
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/callback_filter.c?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/filter/callback_filter.c
diff -u php-src/ext/filter/callback_filter.c:1.11 php-src/ext/filter/callback_filter.c:1.12
--- php-src/ext/filter/callback_filter.c:1.11 Tue Oct 24 15:06:01 2006
+++ php-src/ext/filter/callback_filter.c Thu Nov 9 16:34:00 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: callback_filter.c,v 1.11 2006/10/24 15:06:01 iliaa Exp $ */
+/* $Id: callback_filter.c,v 1.12 2006/11/09 16:34:00 nlopess Exp $ */
#include "php_filter.h"
@@ -42,15 +42,14 @@
if (retval_ptr != value) {
zval_dtor(value);
COPY_PZVAL_TO_ZVAL(*value, retval_ptr);
+ } else {
+ zval_ptr_dtor(&retval_ptr);
}
} else {
zval_dtor(value);
Z_TYPE_P(value) = IS_NULL;
}
- if (retval_ptr) {
- zval_ptr_dtor(&retval_ptr);
- }
efree(args);
}