moriyoshi Mon Feb 21 05:19:12 2005 EDT
Modified files:
/php-src/ext/mbstring php_mbregex.c
Log:
- Fix bug #30868 (evaluated pointer comparison in mbregex causes compile
failure).
http://cvs.php.net/diff.php/php-src/ext/mbstring/php_mbregex.c?r1=1.50&r2=1.51&ty=u
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.50
php-src/ext/mbstring/php_mbregex.c:1.51
--- php-src/ext/mbstring/php_mbregex.c:1.50 Sun Feb 20 17:18:07 2005
+++ php-src/ext/mbstring/php_mbregex.c Mon Feb 21 05:19:11 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.c,v 1.50 2005/02/20 22:18:07 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.51 2005/02/21 10:19:11 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -501,7 +501,7 @@
zend_get_parameters_ex(1, &arg1) != FAILURE) {
convert_to_string_ex(arg1);
mbctype = php_mb_regex_name2mbctype(Z_STRVAL_PP(arg1));
- if (mbctype < 0) {
+ if (mbctype == ONIG_ENCODING_UNDEF) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
encoding \"%s\"", Z_STRVAL_PP(arg1));
RETVAL_FALSE;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
