Module: libav
Branch: release/12
Commit: d41f07ddd1f6285efee7588f8717434a31b1a3a8
Author: Sean McGovern <gsean...@gmail.com>
Committer: Sean McGovern <gsean...@gmail.com>
Date: Thu Mar 30 16:21:38 2017 -0400
mpeg4videodec: raise an error if sprite_trajectory.table is NULL
CC: libav-sta...@libav.org
Bug-Id: 1012
(cherry picked from commit 6ac0e7818399a57e4684202bac79f35b3561ad1e)
Signed-off-by: Sean McGovern <gsean...@gmail.com>
---
libavcodec/mpeg4videodec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index e16d482..efd0f22 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;
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
