[FFmpeg-cvslog] avformat/assdec: make sure to free allocated data in case of error

Clément Bœsch git at videolan.org
Sat Sep 27 17:53:22 CEST 2014


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Sep 27 17:49:49 2014 +0200| [71f6275169cef3557375784cefcdc62883f3d620] | committer: Clément Bœsch

avformat/assdec: make sure to free allocated data in case of error

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

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

diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 1316e64..ba7bc8b 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -148,9 +148,6 @@ static int ass_read_header(AVFormatContext *s)
         sub->duration = duration;
     }
 
-    av_bprint_finalize(&line, NULL);
-    av_bprint_finalize(&rline, NULL);
-
     res = avpriv_bprint_to_extradata(st->codec, &header);
     if (res < 0)
         goto end;
@@ -158,6 +155,9 @@ static int ass_read_header(AVFormatContext *s)
     ff_subtitles_queue_finalize(&ass->q);
 
 end:
+    av_bprint_finalize(&header, NULL);
+    av_bprint_finalize(&line,   NULL);
+    av_bprint_finalize(&rline,  NULL);
     return res;
 }
 



More information about the ffmpeg-cvslog mailing list