mpeg4videodec: raise an error if sprite_trajectory.table is NULL

Message ID 20170405212440.C5DF55DB0C@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau April 5, 2017, 9:24 p.m.
Module: libav
Branch: master
Commit: 6ac0e7818399a57e4684202bac79f35b3561ad1e

Author:    Sean McGovern <gseanmcg@gmail.com>
Committer: Sean McGovern <gseanmcg@gmail.com>
Date:      Thu Mar 30 16:21:38 2017 -0400

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(+)

Patch

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 8891ec1..eb1b672 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;