Small simplification (ToCharset).

[vlc] / src / text / unicode.c

diff --git a/src/text/unicode.c b/src/text/unicode.c
index 313bbede7917130e853b4f7a37f7531956b4e3b6..bad916cedac7fa2cd7119e1c79e274d2152d5d2b 100644 (file)
--- a/src/text/unicode.c
+++ b/src/text/unicode.c
@@ -189,6 +189,8 @@ int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap )
     char *ansi = ToLocaleDup (str);
     free (str);
 
+    if (ansi == NULL)
+        return -1;
     fputs (ansi, stream);
     free (ansi);
     return res;
@@ -433,7 +435,7 @@ void *ToCharset(const char *charset, const char *in, size_t *outsize)
 
         const char *inp = in;
         char *outp = res;
-        size_t inb = inlen + 1;
+        size_t inb = inlen;
         size_t outb = outlen;
 
         if (vlc_iconv (hd, &inp, &inb, &outp, &outb) != (size_t)(-1))
@@ -447,11 +449,9 @@ void *ToCharset(const char *charset, const char *in, size_t *outsize)
         }
 
         free (res);
+        res = NULL;
         if (errno != E2BIG) /* conversion failure */
-        {
-            res = NULL;
             break;
-        }
     }
     vlc_iconv_close (hd);
     return res;