[FFmpeg-devel] [PATCH] avcodec/ffv1dec: don't add offsets to NULL pointers

[FFmpeg-devel] [PATCH] avcodec/ffv1dec: don't add offsets to NULL pointers

[James Almer]

Fixes: libavcodec/ffv1dec.c:452:43: runtime error: applying zero offset to null pointer
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/ffv1dec.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 8d10d2cf8b..d613aa5395 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -444,14 +444,16 @@ static int decode_slice(AVCodecContext *c, void *arg)
     } else if (f->use32bit) {
         uint8_t *planes[4] = { p->data[0] + ps * x + y * p->linesize[0],
                                p->data[1] + ps * x + y * p->linesize[1],
-                               p->data[2] + ps * x + y * p->linesize[2],
-                               p->data[3] + ps * x + y * p->linesize[3] };
+                               p->data[2] + ps * x + y * p->linesize[2] };
+        if (f->transparency)
+            planes[3] =        p->data[3] + ps * x + y * p->linesize[3];
         decode_rgb_frame32(f, sc, &gb, planes, width, height, p->linesize);
     } else {
         uint8_t *planes[4] = { p->data[0] + ps * x + y * p->linesize[0],
                                p->data[1] + ps * x + y * p->linesize[1],
-                               p->data[2] + ps * x + y * p->linesize[2],
-                               p->data[3] + ps * x + y * p->linesize[3] };
+                               p->data[2] + ps * x + y * p->linesize[2] };
+        if (f->transparency)
+            planes[3] =        p->data[3] + ps * x + y * p->linesize[3];
         decode_rgb_frame(f, sc, &gb, planes, width, height, p->linesize);
     }
     if (ac != AC_GOLOMB_RICE && f->version > 2) {
-- 
2.50.1

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

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".