[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mbstring/mbstring.c branches/PHP_5_4/ext/mbstring/mbstring.c trunk/ext/mbstring/mbstring.c

[Xinchen Hui]

laruence                                 Fri, 30 Sep 2011 15:08:32 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=317524

Log:
A better fix for #55817 (thanks to bjori)

Bug: https://bugs.php.net/55817 (Assigned) Wrong codes of mb_detect_encoding
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mbstring/mbstring.c
    U   php/php-src/branches/PHP_5_4/ext/mbstring/mbstring.c
    U   php/php-src/trunk/ext/mbstring/mbstring.c

Modified: php/php-src/branches/PHP_5_3/ext/mbstring/mbstring.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mbstring/mbstring.c        2011-09-30 
15:08:25 UTC (rev 317523)
+++ php/php-src/branches/PHP_5_3/ext/mbstring/mbstring.c        2011-09-30 
15:08:32 UTC (rev 317524)
@@ -3017,7 +3017,7 @@
        /* make encoding list */
        list = NULL;
        size = 0;
-       if (ZEND_NUM_ARGS() >= 2) {
+       if (ZEND_NUM_ARGS() >= 2 && !ZVAL_IS_NULL(encoding_list)) {
                switch (Z_TYPE_P(encoding_list)) {
                case IS_ARRAY:
                        if (!php_mb_parse_encoding_array(encoding_list, &list, 
&size, 0 TSRMLS_CC)) {

Modified: php/php-src/branches/PHP_5_4/ext/mbstring/mbstring.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mbstring/mbstring.c        2011-09-30 
15:08:25 UTC (rev 317523)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/mbstring.c        2011-09-30 
15:08:32 UTC (rev 317524)
@@ -3183,7 +3183,7 @@
        /* make encoding list */
        list = NULL;
        size = 0;
-       if (ZEND_NUM_ARGS() >= 2) {
+       if (ZEND_NUM_ARGS() >= 2 && !ZVAL_IS_NULL(encoding_list)) {
                switch (Z_TYPE_P(encoding_list)) {
                case IS_ARRAY:
                        if (FAILURE == 
php_mb_parse_encoding_array(encoding_list, &list, &size, 0 TSRMLS_CC)) {

Modified: php/php-src/trunk/ext/mbstring/mbstring.c
===================================================================
--- php/php-src/trunk/ext/mbstring/mbstring.c   2011-09-30 15:08:25 UTC (rev 
317523)
+++ php/php-src/trunk/ext/mbstring/mbstring.c   2011-09-30 15:08:32 UTC (rev 
317524)
@@ -3190,7 +3190,7 @@
        /* make encoding list */
        list = NULL;
        size = 0;
-       if (ZEND_NUM_ARGS() >= 2) {
+       if (ZEND_NUM_ARGS() >= 2 && !ZVAL_IS_NULL(encoding_list)) {
                switch (Z_TYPE_P(encoding_list)) {
                case IS_ARRAY:
                        if (FAILURE == 
php_mb_parse_encoding_array(encoding_list, &list, &size, 0 TSRMLS_CC)) {


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