git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e2f3ea1
)
avformat/avienc: Correct possible dereference of null
author
Roman Savchenko
<gmstima@gmail.com>
Thu, 28 May 2015 15:25:56 +0000
(18:25 +0300)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 28 May 2015 22:04:41 +0000
(
00:04
+0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avienc.c
patch
|
blob
|
history
diff --git
a/libavformat/avienc.c
b/libavformat/avienc.c
index
5396a7d
..
e5609d9
100644
(file)
--- 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);
}