[libav-devel] [PATCH 7/8] ffv1: Check memory allocations

[Vittorio Giovara]

---
 libavcodec/ffv1.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index d1a6a83..1a02cf8 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -204,6 +204,8 @@ av_cold int ffv1_init_slice_contexts(FFV1Context *f)
         int sys         = f->avctx->height *  sy      / f->num_v_slices;
         int sye         = f->avctx->height * (sy + 1) / f->num_v_slices;
         f->slice_context[i] = fs;
+        if (!f->slice_context[i])
+            goto memfail;
         memcpy(fs, f, sizeof(*fs));
         memset(fs->rc_stat2, 0, sizeof(fs->rc_stat2));
 
@@ -215,9 +217,17 @@ av_cold int ffv1_init_slice_contexts(FFV1Context *f)
         fs->sample_buffer = av_malloc(3 * MAX_PLANES * (fs->width + 6) *
                                       sizeof(*fs->sample_buffer));
         if (!fs->sample_buffer)
-            return AVERROR(ENOMEM);
+            goto memfail;
     }
     return 0;
+memfail:
+    for (i = 0; i < f->slice_count; i++) {
+        if (!f->slice_context[i])
+            continue;
+        av_freep(&f->slice_context[i]->sample_buffer);
+        av_freep(&f->slice_context[i]);
+    }
+    return AVERROR(ENOMEM);
 }
 
 int ffv1_allocate_initial_states(FFV1Context *f)
-- 
1.9.5 (Apple Git-50.3)

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel