mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 20:16:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Prevent iconv() being passed an empty string in utf8_convert()

Browse Source 
svn path=/trunk/netsurf/; revision=5202
This commit is contained in:
Chris Young 2008-08-26 00:53:02 +00:00
parent b89a093ba9
commit 553c4aac8b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils/utf8.c
View File

@ -278,6 +278,13 @@ utf8_convert_ret utf8_convert(const char *string, size_t len,
char *temp, *out, *in;
size_t slen, rlen;
if (slen == 0 || string[0] == '\0') {
/* On AmigaOS, iconv() returns an error if we pass an empty string. This
* prevents iconv() being called as there is no conversion necessary anyway. */
*result = strdup("");
return UTF8_CONVERT_OK;
}
assert(string && from && to && result);
if (strcasecmp(from, to) == 0) {
@ -333,6 +340,10 @@ utf8_convert_ret utf8_convert(const char *string, size_t len,
/* perform conversion */
if (iconv(cd, &in, &slen, &out, &rlen) == (size_t)-1) {
printf("Failed, errno == %d (%s)\n",
errno, strerror(errno));
free(temp);
/* clear the cached conversion descriptor as it's invalid */
last_cd.from[0] = '\0';