moriyoshi Mon Feb 21 05:20:23 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/mbstring php_mbregex.c
Log:
- MFH: fix bug #30868 (evaluated pointer comparison in mbregex causes compile
failure).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.254&r2=1.1760.2.255&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.254 php-src/NEWS:1.1760.2.255
--- php-src/NEWS:1.1760.2.254 Mon Feb 21 05:14:29 2005
+++ php-src/NEWS Mon Feb 21 05:20:23 2005
@@ -98,6 +98,8 @@
- Fixed bug #31055 (apache2filter: per request leak proportional to the full
path of the request URI). (kameshj at fastmail dot fm)
- Fixed bug #30901 (can't send cookies with soap envelop). (Dmitry)
+- Fixed bug #30868 (evaluated pointer comparison in mbregex causes compile
+ failure). (Moriyoshi)
- Fixed bug #30862 (Static array with boolean indexes). (Marcus)
- Fixed bug #30726 (-.1 like numbers are not being handled correctly). (Ilia)
- Fixed bug #30725 (PHP segfaults when an exception is thrown in getIterator()
http://cvs.php.net/diff.php/php-src/ext/mbstring/php_mbregex.c?r1=1.48.2.1&r2=1.48.2.2&ty=u
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.48.2.1
php-src/ext/mbstring/php_mbregex.c:1.48.2.2
--- php-src/ext/mbstring/php_mbregex.c:1.48.2.1 Sun Feb 20 18:02:48 2005
+++ php-src/ext/mbstring/php_mbregex.c Mon Feb 21 05:20:23 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.c,v 1.48.2.1 2005/02/20 23:02:48 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.48.2.2 2005/02/21 10:20:23 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
