com php-src: Merge branch 'PHP-7.1' into PHP-7.2: NEWS ext/mbstring/mbstring.c

From: Date: Sat, 04 Aug 2018 10:57:05 +0000
Subject: com php-src: Merge branch 'PHP-7.1' into PHP-7.2: NEWS ext/mbstring/mbstring.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-102808@lists.php.net to get a copy of this message
Commit: db8bcdba80530e68808ca588f6bfea79957dc80e Author: Christoph M. Becker <cmbecker69@gmx.de> Sat, 4 Aug 2018 12:57:05 +0200 Parents: ffae3fb25d288c828a79334d663f146bed0505ea c00f5e6531a3f72bb8f7c107d2c390fadad736a0 Branches: PHP-7.2 PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=db8bcdba80530e68808ca588f6bfea79957dc80e Log: Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: Fix #76704: mb_detect_order return value varies based on argument type Bugs: https://bugs.php.net/76704 Changed paths: MM NEWS MM ext/mbstring/mbstring.c Diff: diff --cc NEWS index 099b176,e02ef74..379e1a9 --- a/NEWS +++ b/NEWS @@@ -1,9 -1,12 +1,12 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? ????, PHP 7.1.22 +?? ??? 2018, PHP 7.2.10 + - mbstring: + . Fixed bug #76704 (mb_detect_order return value varies based on argument + type). (cmb) -16 Aug 2018, PHP 7..1.21 +16 Aug 2018, PHP 7.2.9 - Calendar: . Fixed bug #52974 (jewish.c: compile error under Windows with GBK charset). diff --cc ext/mbstring/mbstring.c index 3a9e517,fa2d794..2ec7f1a --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@@ -742,64 -724,74 +742,64 @@@ php_mb_parse_encoding_list(const char * size = n + MBSTRG(default_detect_order_list_size); /* make list */ list = (const mbfl_encoding **)pecalloc(size, sizeof(mbfl_encoding*), persistent); - if (list != NULL) { - entry = list; - n = 0; - bauto = 0; - p1 = tmpstr; - do { - p2 = p = (char*)php_memnstr(p1, ",", 1, endp); - if (p == NULL) { - p = endp; - } + entry = list; + n = 0; + bauto = 0; + p1 = tmpstr; + do { + p2 = p = (char*)php_memnstr(p1, ",", 1, endp); + if (p == NULL) { + p = endp; + } + *p = '\0'; + /* trim spaces */ + while (p1 < p && (*p1 == ' ' || *p1 == '\t')) { + p1++; + } + p--; + while (p > p1 && (*p == ' ' || *p == '\t')) { *p = '\0'; - /* trim spaces */ - while (p1 < p && (*p1 == ' ' || *p1 == '\t')) { - p1++; - } p--; - while (p > p1 && (*p == ' ' || *p == '\t')) { - *p = '\0'; - p--; - } - /* convert to the encoding number and check encoding */ - if (strcasecmp(p1, "auto") == 0) { - if (!bauto) { - const enum mbfl_no_encoding *src = MBSTRG(default_detect_order_list); - const size_t identify_list_size = MBSTRG(default_detect_order_list_size); - size_t i; - bauto = 1; - for (i = 0; i < identify_list_size; i++) { - *entry++ = mbfl_no2encoding(*src++); - n++; - } - } - } else { - const mbfl_encoding *encoding = mbfl_name2encoding(p1); - if (encoding) { - *entry++ = encoding; + } + /* convert to the encoding number and check encoding */ + if (strcasecmp(p1, "auto") == 0) { + if (!bauto) { + const enum mbfl_no_encoding *src = MBSTRG(default_detect_order_list); + const size_t identify_list_size = MBSTRG(default_detect_order_list_size); + size_t i; + bauto = 1; + for (i = 0; i < identify_list_size; i++) { + *entry++ = mbfl_no2encoding(*src++); n++; - } else { - ret = FAILURE; } } - p1 = p2 + 1; - } while (n < size && p2 != NULL); - if (n > 0) { - if (return_list) { - *return_list = list; + } else { + const mbfl_encoding *encoding = mbfl_name2encoding(p1); + if (encoding) { + *entry++ = encoding; + n++; } else { - ret = 0; - pefree(list, persistent); ++ ret = FAILURE; } + } + p1 = p2 + 1; + } while (n < size && p2 != NULL); + if (n > 0) { + if (return_list) { + *return_list = list; } else { pefree(list, persistent); - if (return_list) { - *return_list = NULL; - } - ret = FAILURE; - } - if (return_size) { - *return_size = n; } } else { + pefree(list, persistent); if (return_list) { *return_list = NULL; } - ret = 0; - if (return_size) { - *return_size = 0; - } + ret = FAILURE; } + if (return_size) { + *return_size = n; + } efree(tmpstr); }

« previous php.cvs (#102808) next »