felipe Tue, 22 Nov 2011 19:18:34 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=319698
Log: - Fix the fix (thanks Chris Jones!) Changed paths: U php/php-src/branches/PHP_5_3/ext/mbstring/php_mbregex.c U php/php-src/branches/PHP_5_4/ext/mbstring/php_mbregex.c U php/php-src/trunk/ext/mbstring/php_mbregex.c Modified: php/php-src/branches/PHP_5_3/ext/mbstring/php_mbregex.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mbstring/php_mbregex.c 2011-11-22 18:50:57 UTC (rev 319697) +++ php/php-src/branches/PHP_5_3/ext/mbstring/php_mbregex.c 2011-11-22 19:18:34 UTC (rev 319698) @@ -1254,7 +1254,7 @@ return; } - if (arg_pattern_len == 0) { + if (argc > 1 && arg_pattern_len == 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty pattern"); RETURN_FALSE; } Modified: php/php-src/branches/PHP_5_4/ext/mbstring/php_mbregex.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/mbstring/php_mbregex.c 2011-11-22 18:50:57 UTC (rev 319697) +++ php/php-src/branches/PHP_5_4/ext/mbstring/php_mbregex.c 2011-11-22 19:18:34 UTC (rev 319698) @@ -1254,7 +1254,7 @@ return; } - if (arg_pattern_len == 0) { + if (argc > 1 && arg_pattern_len == 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty pattern"); RETURN_FALSE; } Modified: php/php-src/trunk/ext/mbstring/php_mbregex.c =================================================================== --- php/php-src/trunk/ext/mbstring/php_mbregex.c 2011-11-22 18:50:57 UTC (rev 319697) +++ php/php-src/trunk/ext/mbstring/php_mbregex.c 2011-11-22 19:18:34 UTC (rev 319698) @@ -1319,7 +1319,7 @@ return; } - if (arg_pattern_len == 0) { + if (argc > 1 && arg_pattern_len == 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty pattern"); RETURN_FALSE; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php