avcodec/mpegvideo: Use av_memdup() for allocating thread_context
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Jun 2015 19:28:54 +0000 (21:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Jun 2015 20:47:50 +0000 (22:47 +0200)
Also check for allocation failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c

index 839dc23..e6e5326 100644 (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;