highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid a null pointer dereference after oom on frame size change in mpegvideo.c.

Browse Source 
Fixes ticket #2735.
This commit is contained in:
Carl Eugen Hoyos
2013-06-30 23:45:37 +02:00
parent f4aa8085f2
commit 712ef25116
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mpegvideo.c
View File

@@ -1223,7 +1223,8 @@ int ff_MPV_common_frame_size_change(MpegEncContext *s)
(s->mb_height * (i + 1) + nb_slices / 2) / nb_slices; (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices;
} }
} else { } else {
if (init_duplicate_context(s) < 0) err = init_duplicate_context(s);
if (err < 0)
goto fail; goto fail;
s->start_mb_y = 0; s->start_mb_y = 0;
s->end_mb_y = s->mb_height; s->end_mb_y = s->mb_height;