[FFmpeg-cvslog] avformat/avienc: Correct possible dereference of null

Roman Savchenko git at videolan.org
Fri May 29 00:26:52 CEST 2015


ffmpeg | branch: master | Roman Savchenko <gmstima at gmail.com> | Thu May 28 18:25:56 2015 +0300| [e85d91da48cf27a0852f5c9a676023fa08a59a7a] | committer: Michael Niedermayer

avformat/avienc: Correct possible dereference of null

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/avienc.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 5396a7d..e5609d9 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -386,6 +386,8 @@ static int avi_write_header(AVFormatContext *s)
                 t = NULL;
                 if (langstr) {
                     char* str = av_asprintf("Subtitle - %s-xx;02", langstr);
+                    if (!str)
+                        return AVERROR(ENOMEM);
                     ff_riff_write_info_tag(s->pb, "strn", str);
                     av_free(str);
                 }



More information about the ffmpeg-cvslog mailing list