From 130b096aea6e91cff4b608f9ef61e9c96e3166d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 9 Jun 2010 09:19:36 +0000 Subject: [PATCH] Make sure the http protocol handler returns errors if a delayed open had failed Originally committed as revision 23548 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/http.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/http.c b/libavformat/http.c index ef55bb0ad8..de76b4d777 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -371,6 +371,8 @@ static int http_read(URLContext *h, uint8_t *buf, int size) if (ret != 0) return ret; } + if (!s->hd) + return AVERROR(EIO); /* A size of zero can be used to force * initializaton of the connection. */ @@ -429,6 +431,8 @@ static int http_write(URLContext *h, const uint8_t *buf, int size) if (ret != 0) return ret; } + if (!s->hd) + return AVERROR(EIO); if (s->chunksize == -1) { /* 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) return ret; } + if (!s->hd) + return AVERROR(EIO); if (whence == AVSEEK_SIZE) return s->filesize;