highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure the http protocol handler returns errors if a delayed open had failed

Browse Source 
Originally committed as revision 23548 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-06-09 09:19:36 +00:00
parent 461628c6a8
commit 130b096aea
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/http.c
View File

@ -371,6 +371,8 @@ static int http_read(URLContext *h, uint8_t *buf, int size)
if (ret != 0) if (ret != 0)
return ret; return ret;
} }
if (!s->hd)
return AVERROR(EIO);
/* A size of zero can be used to force /* A size of zero can be used to force
* initializaton of the connection. */ * initializaton of the connection. */
@ -429,6 +431,8 @@ static int http_write(URLContext *h, const uint8_t *buf, int size)
if (ret != 0) if (ret != 0)
return ret; return ret;
} }
if (!s->hd)
return AVERROR(EIO);
if (s->chunksize == -1) { if (s->chunksize == -1) {
/* headers are sent without any special encoding */ /* headers are sent without any special encoding */
@ -485,6 +489,8 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence)
if (ret != 0) if (ret != 0)
return ret; return ret;
} }
if (!s->hd)
return AVERROR(EIO);
if (whence == AVSEEK_SIZE) if (whence == AVSEEK_SIZE)
return s->filesize; return s->filesize;