OSDN Git Service

Fix bugs in the http custom header handling
authorMartin Storsjö <martin@martin.st>
Tue, 8 Jun 2010 11:06:36 +0000 (11:06 +0000)
committerMartin Storsjö <martin@martin.st>
Tue, 8 Jun 2010 11:06:36 +0000 (11:06 +0000)
Initialize the buffer av_strlcatf writes into.
Add the dash at the end of the Range header.

10l to me for not spotting it earlier

Originally committed as revision 23528 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/http.c

index 0b4b570..09acee6 100644 (file)
@@ -270,7 +270,7 @@ static int http_connect(URLContext *h, const char *path, const char *hoststr,
     HTTPContext *s = h->priv_data;
     int post, err;
     char line[1024];
-    char headers[1024];
+    char headers[1024] = "";
     char *authstr = NULL;
     int64_t off = s->off;
     int len = 0;
@@ -290,7 +290,7 @@ static int http_connect(URLContext *h, const char *path, const char *hoststr,
                           sizeof(headers) - len);
     if (!has_header(s->headers, "\r\nRange: "))
         len += av_strlcatf(headers + len, sizeof(headers) - len,
-                           "Range: bytes=%"PRId64"\r\n", s->off);
+                           "Range: bytes=%"PRId64"-\r\n", s->off);
     if (!has_header(s->headers, "\r\nConnection: "))
         len += av_strlcpy(headers + len, "Connection: close\r\n",
                           sizeof(headers)-len);