aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-14 13:02:19 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-18 20:23:46 +0200
commita18e8d82de87f6cd88a68ede8f5526a102d47869 (patch)
tree512a5c813f99b48e12cfeda9e067c31ca31b582e /ffmpeg.c
parent441ef87ea8e0422fa5eee39702cabae141ebda89 (diff)
downloadffmpeg-a18e8d82de87f6cd88a68ede8f5526a102d47869.tar.gz
ffmpeg: Fix crash with ost->last_frame allocation failure
Fixes: 1013dbde2c360d939cc2dfc33e4f275c_signal_sigsegv_a0500f_45_320vp3.nsv with memlimit of 536870912 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit fd4c87fa3becaf8a6c480db915daf51e297b76c5) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index d23e713d5a..52aa967d9a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1182,7 +1182,7 @@ static void do_video_out(AVFormatContext *s,
if (!ost->last_frame)
ost->last_frame = av_frame_alloc();
av_frame_unref(ost->last_frame);
- if (next_picture)
+ if (next_picture && ost->last_frame)
av_frame_ref(ost->last_frame, next_picture);
else
av_frame_free(&ost->last_frame);