]> git.sesse.net Git - vlc/commitdiff
net: drop trailing new line in proxy URL
authorRémi Denis-Courmont <remi@remlab.net>
Fri, 12 Apr 2013 16:33:04 +0000 (19:33 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Fri, 12 Apr 2013 16:33:04 +0000 (19:33 +0300)
src/posix/netconf.c

index f5a61c352f920a3d1468bf79a69dad23083a47e3..9e794bb030067e18b5f210e80a8ca9ee55feca24 100644 (file)
@@ -95,12 +95,16 @@ char *vlc_getProxyUrl(const char *url)
         close(fd[0]);
         while (waitpid(pid, &(int){ 0 }, 0) == -1);
 
-        if (len >= sizeof (buf))
-            return NULL; /* overflow */
         if (len >= 9 && !strncasecmp(buf, "direct://", 9))
             return NULL;
-        if (len > 0)
-            return strndup(buf, len);
+
+        char *end = memchr(buf, '\n', len);
+        if (end != NULL)
+        {
+            *end = '\0';
+            return strdup(buf);
+        }
+        /* Parse error: fallback (may be due to missing executable) */
     }
     else
         close(fd[0]);