diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-06 21:28:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-06 22:47:50 +0200 |
| commit | 46428ea332d8afa3f598d6a9d660716a4f90da6d (patch) | |
| tree | c3a4ab9b6351b0a1536da5225de67bf6d207db27 | |
| parent | 7ddedd23625adeb2926b76df84987d658cc876c8 (diff) | |
| download | ffmpeg-46428ea332d8afa3f598d6a9d660716a4f90da6d.tar.gz | |
avcodec/mpegvideo: Use av_memdup() for allocating thread_context
Also check for allocation failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 839dc23b7d..e6e53268d8 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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; |