From 6ac0e7818399a57e4684202bac79f35b3561ad1e Mon Sep 17 00:00:00 2001
From: Sean McGovern <gseanmcg@gmail.com>
Date: Thu, 30 Mar 2017 16:21:38 -0400
Subject: [PATCH] mpeg4videodec: raise an error if sprite_trajectory.table is
NULL
CC: libav-stable@libav.org
Bug-Id: 1012
---
libavcodec/mpeg4videodec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 8891ec1bb79..eb1b67273bc 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -186,6 +186,10 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g
if (w <= 0 || h <= 0)
return AVERROR_INVALIDDATA;
+ /* the decoder was not properly initialized and we cannot continue */
+ if (sprite_trajectory.table == NULL)
+ return AVERROR_INVALIDDATA;
+
for (i = 0; i < ctx->num_sprite_warping_points; i++) {
int length;
int x = 0, y = 0;
--
GitLab