Browse Source

lavf/http: return error on seeking to negative postion

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
tags/n2.3
Lukasz Marek 11 years ago
parent
commit
4ba6a534dc
1 changed files with 7 additions and 4 deletions
  1. +7
    -4
      libavformat/http.c

+ 7
- 4
libavformat/http.c View File

@@ -955,16 +955,19 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence)
else if ((s->filesize == -1 && whence == SEEK_END) || h->is_streamed)
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;
else if (whence == SEEK_END)
off += s->filesize;
if (off < 0)
return AVERROR(EINVAL);
s->off = off;

/* 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 it fails, continue on old connection */
av_dict_copy(&options, s->chained_options, 0);
if (http_open_cnx(h, &options) < 0) {


Loading…
Cancel
Save