wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 838319: don't assert() on bad STUN input credentials; accept utf8 for UTF-8 r=dmose

Browse Source
This commit is contained in:
Randell Jesup 2013-04-06 03:29:58 -04:00
parent dee7b837d4
commit f188607fe1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
media/mtransport/third_party/nICEr/src/util/mbslen.c vendored
View File

@ -88,13 +88,14 @@ mbslen(const char *s, size_t *ncharsp)
for (i=0; i<strlen(my_locale); i++)
my_locale[i] = toupper(my_locale[i]);
if (!strstr(my_locale, "UTF-8"))
if (!strstr(my_locale, "UTF-8") && !strstr(my_locale, "UTF8"))
ABORT(R_NOT_FOUND);
#else
/* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */
/* null-checking setlocale is required because Android */
char *locale = setlocale(LC_CTYPE, 0);
if (!locale || !strcasestr(locale, "UTF-8"))
/* some systems use "utf8" instead of "UTF-8" like Fedora 17 */
if (!locale || (!strcasestr(locale, "UTF-8") && !strcasestr(locale, "UTF8")))
ABORT(R_NOT_FOUND);
#endif
@ -112,11 +113,9 @@ mbslen(const char *s, size_t *ncharsp)
#endif /* DARWIN */
{
if (nbytes == (size_t)-1) /* should never happen */ {
assert(0);
ABORT(R_INTERNAL);
}
if (nbytes == (size_t)-2) /* encoding error */ {
assert(0);
ABORT(R_BAD_DATA);
}