felipe Sun Feb 24 18:34:31 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/filter filter.c /php-src NEWS Log: Fixed segfault in filter extension when using callbacks. (reported & patched by Arnar Mar Sig) http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.41&r2=1.52.2.42&diff_format=u Index: php-src/ext/filter/filter.c diff -u php-src/ext/filter/filter.c:1.52.2.41 php-src/ext/filter/filter.c:1.52.2.42 --- php-src/ext/filter/filter.c:1.52.2.41 Wed Feb 6 19:07:36 2008 +++ php-src/ext/filter/filter.c Sun Feb 24 18:34:30 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.52.2.41 2008/02/06 19:07:36 jani Exp $ */ +/* $Id: filter.c,v 1.52.2.42 2008/02/24 18:34:30 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -275,7 +275,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.41 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.42 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -322,7 +322,7 @@ filter_func.function(*value, flags, options, charset TSRMLS_CC); if ( - options && + options && (Z_TYPE_P(options) == IS_ARRAY || Z_TYPE_P(options) == IS_OBJECT) && ((flags & FILTER_NULL_ON_FAILURE && Z_TYPE_PP(value) == IS_NULL) || (!(flags & FILTER_NULL_ON_FAILURE) && Z_TYPE_PP(value) == IS_BOOL && Z_LVAL_PP(value) == 0)) && zend_hash_exists(HASH_OF(options), "default", sizeof("default")) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1095&r2=1.2027.2.547.2.1096&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1095 php-src/NEWS:1.2027.2.547.2.1096 --- php-src/NEWS:1.2027.2.547.2.1095 Sun Feb 24 16:09:05 2008 +++ php-src/NEWS Sun Feb 24 18:34:30 2008 @@ -8,6 +8,8 @@ (Ilia) - Fixed a bug with PDO::FETCH_COLUMN|PDO::FETCH_GROUP mode when a column # by which to group by data is specified. (Ilia) +- Fixed segfault in filter extension when using callbacks. (Arnar Mar Sig, + Felipe) - Upgraded PCRE to version 7.6 (Nuno)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php