[FFmpeg-cvslog] Merge commit '6ac0e7818399a57e4684202bac79f35b3561ad1e'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Oct 26 16:19:43 2017 -0300| [af0505ed951505485f54c65decde2232385314f0] | committer: James Almer

Merge commit '6ac0e7818399a57e4684202bac79f35b3561ad1e'

* commit '6ac0e7818399a57e4684202bac79f35b3561ad1e':
  mpeg4videodec: raise an error if sprite_trajectory.table is NULL

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af0505ed951505485f54c65decde2232385314f0
---

 libavcodec/mpeg4videodec.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 82c4f8fc8c..0203503599 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -189,6 +189,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;


======================================================================