mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 23:28:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

std: Implement error checks for c_iconv().

Browse source
This commit is contained in:
Andreas Schneider 2013-03-11 11:13:21 +01:00
parent 862f83988f
commit 4c83526676
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/std/c_string.c
View file

@ -87,7 +87,6 @@ static char *c_iconv(const char* str, enum iconv_direction dir)
size_t size;
size_t outsize;
char *out;
char *out_in;
size_t ret;
if (str == NULL)
@ -104,7 +103,9 @@ static char *c_iconv(const char* str, enum iconv_direction dir)
size = strlen(in);
outsize = size*2;
out = c_malloc(outsize);
out_in = out;
if (out == NULL) {
return NULL;
}
if (dir == iconv_to_native) {
ret = iconv(_iconvs.to, &in, &size, &out, &outsize);
@ -112,9 +113,11 @@ static char *c_iconv(const char* str, enum iconv_direction dir)
ret = iconv(_iconvs.from, &in, &size, &out, &outsize);
}
assert(ret != (size_t)-1);
if (ret == (size_t)-1) {
return NULL;
}
return out_in;
return out;
}
#endif