[FFmpeg-cvslog] mmsh: Properly clean up if the second ffurl_alloc failed

Martin Storsjö git at videolan.org
Fri Dec 2 01:00:52 CET 2011


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Dec  1 11:48:03 2011 +0200| [9c6777bd9367e8680bb7ada9852f5760dc8a8594] | committer: Martin Storsjö

mmsh: Properly clean up if the second ffurl_alloc failed

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c6777bd9367e8680bb7ada9852f5760dc8a8594
---

 libavformat/mmsh.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c
index 8a6de32..3761016 100644
--- a/libavformat/mmsh.c
+++ b/libavformat/mmsh.c
@@ -262,9 +262,9 @@ static int mmsh_open(URLContext *h, const char *uri, int flags)
     // close the socket and then reopen it for sending the second play request.
     ffurl_close(mms->mms_hd);
     memset(headers, 0, sizeof(headers));
-    if (ffurl_alloc(&mms->mms_hd, httpname, AVIO_FLAG_READ,
-                    &h->interrupt_callback) < 0) {
-        return AVERROR(EIO);
+    if ((err = ffurl_alloc(&mms->mms_hd, httpname, AVIO_FLAG_READ,
+                           &h->interrupt_callback)) < 0) {
+        goto fail;
     }
     stream_selection = av_mallocz(mms->stream_num * 19 + 1);
     if (!stream_selection)



More information about the ffmpeg-cvslog mailing list