har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mpegvideo: Use av_memdup() for allocating thread_context

Browse Source 
Also check for allocation failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-06 21:28:54 +02:00
parent 7ddedd2362
commit 46428ea332
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/mpegvideo.c
View File

@ -1290,8 +1290,9 @@ av_cold int ff_mpv_common_init(MpegEncContext *s)
if (nb_slices > 1) {
for (i = 0; i < nb_slices; i++) {
if (i) {
s->thread_context[i] = av_malloc(sizeof(MpegEncContext));
memcpy(s->thread_context[i], s, sizeof(MpegEncContext));
s->thread_context[i] = av_memdup(s, sizeof(MpegEncContext));
if (!s->thread_context[i])
goto fail;
}
if (init_duplicate_context(s->thread_context[i]) < 0)
goto fail;
@ -1418,8 +1419,11 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s)
if (nb_slices > 1) {
for (i = 0; i < nb_slices; i++) {
if (i) {
s->thread_context[i] = av_malloc(sizeof(MpegEncContext));
memcpy(s->thread_context[i], s, sizeof(MpegEncContext));
s->thread_context[i] = av_memdup(s, sizeof(MpegEncContext));
if (!s->thread_context[i]) {
err = AVERROR(ENOMEM);
goto fail;
}
}
if ((err = init_duplicate_context(s->thread_context[i])) < 0)
goto fail;