# HG changeset patch # User bcoudurier # Date 1263425272 0 # Node ID fc48f8bfbf2e0b396200573b2fad7cea65d8af1f # Parent fbedfacb36ed6facf483777b95cc63b6dc5e9333 restore old buffer content when seek failed in http protocol, fix issue #1631 diff -r fbedfacb36ed -r fc48f8bfbf2e http.c --- a/http.c Wed Jan 13 22:57:37 2010 +0000 +++ b/http.c Wed Jan 13 23:27:52 2010 +0000 @@ -394,6 +394,8 @@ 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 @@ 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 @@ /* 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;