cvs: php-src(PHP_5_2) /ext/filter callback_filter.c
| From: | Ilia Alshanetsky | Date: | Fri, 03 Nov 2006 13:53:24 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/filter callback_filter.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41296@lists.php.net to get a copy of this message | ||
iliaa Fri Nov 3 13:53:24 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter callback_filter.c
Log:
MFH: Fixed a possible crash when callback function returns a non-modified
value
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/callback_filter.c?r1=1.9.2.1&r2=1.9.2.2&diff_format=u
Index: php-src/ext/filter/callback_filter.c
diff -u php-src/ext/filter/callback_filter.c:1.9.2.1 php-src/ext/filter/callback_filter.c:1.9.2.2
--- php-src/ext/filter/callback_filter.c:1.9.2.1 Wed Jul 19 08:35:55 2006
+++ php-src/ext/filter/callback_filter.c Fri Nov 3 13:53:24 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: callback_filter.c,v 1.9.2.1 2006/07/19 08:35:55 tony2001 Exp $ */
+/* $Id: callback_filter.c,v 1.9.2.2 2006/11/03 13:53:24 iliaa Exp $ */
#include "php_filter.h"
@@ -39,9 +39,10 @@
status = call_user_function_ex(EG(function_table), NULL, option_array, &retval_ptr, 1, args,
0, NULL TSRMLS_CC);
if (status == SUCCESS && retval_ptr != NULL) {
- zval_dtor(value);
- *value = *retval_ptr;
- zval_copy_ctor(value);
+ if (retval_ptr != value) {
+ zval_dtor(value);
+ COPY_PZVAL_TO_ZVAL(*value, retval_ptr);
+ }
} else {
zval_dtor(value);
Z_TYPE_P(value) = IS_NULL;