[FFmpeg-cvslog] ffserver: fixed deallocation bug in build_feed_streams

Gregor Riepl git at videolan.org
Sun Jun 5 03:16:43 CEST 2016


ffmpeg | branch: release/3.0 | Gregor Riepl <onitake at gmail.com> | Tue May 24 15:17:22 2016 +0200| [241f1e603f5c958a41083658ab3d494f913d146e] | committer: Michael Niedermayer

ffserver: fixed deallocation bug in build_feed_streams

Signed-off-by: Gregor Riepl <onitake at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit d970f7ba31246040787e5ea6eb73bb85cafb932b)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 ffserver.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/ffserver.c b/ffserver.c
index 374af99..35e399d 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3858,6 +3858,8 @@ drop:
             if (avformat_write_header(s, NULL) < 0) {
                 http_log("Container doesn't support the required parameters\n");
                 avio_closep(&s->pb);
+                s->streams = NULL;
+                s->nb_streams = 0;
                 avformat_free_context(s);
                 goto bail;
             }



More information about the ffmpeg-cvslog mailing list