Skip to content

Commit 72d8660

Browse files
committed
ext/mbstring: voidify php_mb_nls_get_default_detect_order_list()
It is only used once and the return value is not checked. Assert this always succeeds.
1 parent ffda2bc commit 72d8660

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

ext/mbstring/mbstring.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -539,24 +539,20 @@ static void _php_mb_free_regex(void *opaque)
539539
}
540540
/* }}} */
541541

542-
/* {{{ php_mb_nls_get_default_detect_order_list */
543-
static int php_mb_nls_get_default_detect_order_list(enum mbfl_no_language lang, enum mbfl_no_encoding **plist, size_t *plist_size)
542+
static void php_mb_nls_get_default_detect_order_list(enum mbfl_no_language lang, enum mbfl_no_encoding **plist, size_t *plist_size)
544543
{
545-
size_t i;
546-
547544
*plist = (enum mbfl_no_encoding *) php_mb_default_identify_list_neut;
548545
*plist_size = sizeof(php_mb_default_identify_list_neut) / sizeof(php_mb_default_identify_list_neut[0]);
549546

550-
for (i = 0; i < sizeof(php_mb_default_identify_list) / sizeof(php_mb_default_identify_list[0]); i++) {
547+
for (size_t i = 0; i < sizeof(php_mb_default_identify_list) / sizeof(php_mb_default_identify_list[0]); i++) {
551548
if (php_mb_default_identify_list[i].lang == lang) {
552549
*plist = (enum mbfl_no_encoding *)php_mb_default_identify_list[i].list;
553550
*plist_size = php_mb_default_identify_list[i].list_size;
554-
return 1;
551+
return;
555552
}
556553
}
557-
return 0;
554+
ZEND_UNREACHABLE();
558555
}
559-
/* }}} */
560556

561557
static char *php_mb_rfc1867_substring_conf(const zend_encoding *encoding, char *start, size_t len, char quote)
562558
{
@@ -859,6 +855,7 @@ static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
859855
MBSTRG(filter_illegal_substchar) = c;
860856
MBSTRG(current_filter_illegal_substchar) = c;
861857
}
858+
// TODO Warn about invalid character?
862859
}
863860
}
864861
} else {

0 commit comments

Comments
 (0)