From: Christophe Mutricy <xtophe@videolan.org>
Date: Fri, 9 Sep 2005 16:55:37 +0000 (+0000)
Subject: Fix a possible segfault patch by Brian Robb
X-Git-Tag: 0.8.4~558
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1d47f9e6be1ec95ad01ab251d44cec5c923bbfe7;p=vlc

Fix a possible segfault patch by Brian Robb
---

diff --git a/src/extras/libc.c b/src/extras/libc.c
index b74647470f..e5c3e68c59 100644
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -29,6 +29,7 @@
 #include <ctype.h>
 
 #include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #undef iconv_t
 #undef iconv_open
@@ -612,7 +613,14 @@ size_t vlc_iconv( vlc_iconv_t cd, char **inbuf, size_t *inbytesleft,
 #if defined(HAVE_ICONV)
     return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft );
 #else
-    int i_bytes = __MIN(*inbytesleft, *outbytesleft);
+    int i_bytes;
+
+    if (inbytesleft == NULL || outbytesleft == NULL)
+    {
+        return 0;
+    }
+
+    i_bytes = __MIN(*inbytesleft, *outbytesleft);
     if( !inbuf || !outbuf || !i_bytes ) return (size_t)(-1);
     memcpy( *outbuf, *inbuf, i_bytes );
     inbuf += i_bytes;