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

diff --git a/libavformat/http.c b/libavformat/http.c
index ef55bb0ad863c88d8c83f9a173105c1b5a53021e..de76b4d7777103da756a0255caed92e2aafe8c1d 100644 (file)
--- 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;