From a993f1b4f2a51a244eba324bedec3ff4f9e000da Mon Sep 17 00:00:00 2001
From: Yvonne Chen<yvonne.chen@amlogic.com>
Date: Thu, 20  Jul  2017  05:16:56  +0000
Subject: fix 264 mp4 file probe carsh

PD#147475

Change-Id: I9663866a85a1051a34150e5bc8485fc8e8c4c8b9
---
diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c
index ea202e7..e21582b 100644
--- a/libavcodec/h264_parse.c
+++ b/libavcodec/h264_parse.c
@@ -455,6 +455,9 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps,
             nalsize = AV_RB16(p) + 2;
             if (nalsize > size - (p - data))
                 return AVERROR_INVALIDDATA;
+            if (nalsize < 0)
+                return AVERROR_INVALIDDATA;
+
             ret = decode_extradata_ps_mp4(p, nalsize, ps, err_recognition, logctx);
             if (ret < 0) {
                 av_log(logctx, AV_LOG_ERROR,
@@ -469,6 +472,8 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps,
             nalsize = AV_RB16(p) + 2;
             if (nalsize > size - (p - data))
                 return AVERROR_INVALIDDATA;
+            if (nalsize < 0)
+                return AVERROR_INVALIDDATA;
             ret = decode_extradata_ps_mp4(p, nalsize, ps, err_recognition, logctx);
             if (ret < 0) {
                 av_log(logctx, AV_LOG_ERROR,
--
cgit