Skip to content

Commit 848b780

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 6d1fe6e commit 848b780

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
@@ -538,24 +538,20 @@ static void _php_mb_free_regex(void *opaque)
538538
}
539539
/* }}} */
540540

541-
/* {{{ php_mb_nls_get_default_detect_order_list */
542-
static int php_mb_nls_get_default_detect_order_list(enum mbfl_no_language lang, enum mbfl_no_encoding **plist, size_t *plist_size)
541+
static void php_mb_nls_get_default_detect_order_list(enum mbfl_no_language lang, enum mbfl_no_encoding **plist, size_t *plist_size)
543542
{
544-
size_t i;
545-
546543
*plist = (enum mbfl_no_encoding *) php_mb_default_identify_list_neut;
547544
*plist_size = sizeof(php_mb_default_identify_list_neut) / sizeof(php_mb_default_identify_list_neut[0]);
548545

549-
for (i = 0; i < sizeof(php_mb_default_identify_list) / sizeof(php_mb_default_identify_list[0]); i++) {
546+
for (size_t i = 0; i < sizeof(php_mb_default_identify_list) / sizeof(php_mb_default_identify_list[0]); i++) {
550547
if (php_mb_default_identify_list[i].lang == lang) {
551548
*plist = (enum mbfl_no_encoding *)php_mb_default_identify_list[i].list;
552549
*plist_size = php_mb_default_identify_list[i].list_size;
553-
return 1;
550+
return;
554551
}
555552
}
556-
return 0;
553+
ZEND_UNREACHABLE();
557554
}
558-
/* }}} */
559555

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

0 commit comments

Comments
 (0)