[FFmpeg-cvslog] r21208 - trunk/libavformat/http.c

[bcoudurier]

Author: bcoudurier
Date: Thu Jan 14 00:27:52 2010
New Revision: 21208

Log:
restore old buffer content when seek failed in http protocol, fix issue #1631

Modified:
   trunk/libavformat/http.c

Modified: trunk/libavformat/http.c
==============================================================================
--- trunk/libavformat/http.c	Wed Jan 13 23:57:37 2010	(r21207)
+++ trunk/libavformat/http.c	Thu Jan 14 00:27:52 2010	(r21208)
@@ -394,6 +394,8 @@ static int64_t http_seek(URLContext *h, 
     HTTPContext *s = h->priv_data;
     URLContext *old_hd = s->hd;
     int64_t old_off = s->off;
+    uint8_t old_buf[BUFFER_SIZE];
+    int old_buf_size;
 
     if (whence == AVSEEK_SIZE)
         return s->filesize;
@@ -401,6 +403,8 @@ static int64_t http_seek(URLContext *h, 
         return -1;
 
     /* we save the old context in case the seek fails */
+    old_buf_size = s->buf_end - s->buf_ptr;
+    memcpy(old_buf, s->buf_ptr, old_buf_size);
     s->hd = NULL;
     if (whence == SEEK_CUR)
         off += s->off;
@@ -410,6 +414,9 @@ static int64_t http_seek(URLContext *h, 
 
     /* if it fails, continue on old connection */
     if (http_open_cnx(h) < 0) {
+        memcpy(s->buffer, old_buf, old_buf_size);
+        s->buf_ptr = s->buffer;
+        s->buf_end = s->buffer + old_buf_size;
         s->hd = old_hd;
         s->off = old_off;
         return -1;