[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c

[Moriyoshi Koizumi]

moriyoshi               Mon Aug  4 21:06:14 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/mbstring       mbstring.c 
  Log:
  - MFH: More fixes for bug #45691
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.28&r2=1.224.2.22.2.25.2.29&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.28 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.29
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.28        Sun Aug  3 
11:58:15 2008
+++ php-src/ext/mbstring/mbstring.c     Mon Aug  4 21:06:13 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.28 2008/08/03 11:58:15 jani Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.29 2008/08/04 21:06:13 moriyoshi Exp $ 
*/
 
 /*
  * PHP 4 Multibyte String module "mbstring"
@@ -1394,6 +1394,11 @@
                                }
                        }
                }
+       } else {
+               MBSTRG(filter_illegal_mode) = 
MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
+               MBSTRG(current_filter_illegal_mode) = 
MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
+               MBSTRG(filter_illegal_substchar) = 0x3f;        /* '?' */
+               MBSTRG(current_filter_illegal_substchar) = 0x3f;        /* '?' 
*/
        }
 
        return SUCCESS;
@@ -1429,7 +1434,8 @@
        void *re = NULL;
 
        if (!new_value) {
-               return SUCCESS;
+               new_value = entry->orig_value;
+               new_value_length = entry->orig_value_length;
        }
        php_trim(new_value, new_value_length, NULL, 0, &tmp, 3 TSRMLS_CC);
 
@@ -1604,9 +1610,7 @@
        MBSTRG(current_filter_illegal_mode) = MBSTRG(filter_illegal_mode);
        MBSTRG(current_filter_illegal_substchar) = 
MBSTRG(filter_illegal_substchar);
 
-       if (!MBSTRG(encoding_translation)) {
-               MBSTRG(illegalchars) = 0;
-       }
+       MBSTRG(illegalchars) = 0;
 
        n = 0;
        if (MBSTRG(detect_order_list)) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php