[FFmpeg-cvslog] rtmp: Always call rtmp_close() on rtmp_open() failure

[Alexander Drozdov]

ffmpeg | branch: master | Alexander Drozdov <adrozdoff at gmail.com> | Sat Oct 18 16:02:32 2014 +0200| [0034314a69e76a53534a74cceef865cfcb7b42cc] | committer: Luca Barbato

rtmp: Always call rtmp_close() on rtmp_open() failure

Prevent possible memory leaks.

Connect to nginx and request a non-existent resource to
trigger the issue.

CC: libav-stable at libav.org

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Uwe L. Korn <uwelk at xhochy.com>
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

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

 libavformat/rtmpproto.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 55987b7..d0e9792 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -2817,11 +2817,10 @@ reconnect:
     }
 
     if (rt->is_input) {
-        int err;
         // generate FLV header for demuxer
         rt->flv_size = 13;
-        if ((err = av_reallocp(&rt->flv_data, rt->flv_size)) < 0)
-            return err;
+        if ((ret = av_reallocp(&rt->flv_data, rt->flv_size)) < 0)
+            goto fail;
         rt->flv_off  = 0;
         memcpy(rt->flv_data, "FLV\1\0\0\0\0\011\0\0\0\0", rt->flv_size);
 
@@ -2832,7 +2831,7 @@ reconnect:
         // audio or video packet arrives.
         while (!rt->has_audio && !rt->has_video && !rt->received_metadata) {
             if ((ret = get_packet(s, 0)) < 0)
-               return ret;
+               goto fail;
         }
 
         // Either after we have read the metadata or (if there is none) the