diff mbox

[FFmpeg-devel,1/2] avformat/isom: return proper error values in ff_mp4_read_dec_config_descr

Message ID 20171125185457.6860-1-jamrial@gmail.com
State Accepted
Commit 08b294bf5f4e76ca9217e3206224441048d0f843
Headers show

Commit Message

James Almer Nov. 25, 2017, 6:54 p.m. UTC 
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/isom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer Nov. 26, 2017, 2:05 a.m. UTC | #1 
On Sat, Nov 25, 2017 at 03:54:56PM -0300, James Almer wrote:
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavformat/isom.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

probably ok

thx

[...]
James Almer Nov. 26, 2017, 2:16 a.m. UTC | #2 
On 11/25/2017 11:05 PM, Michael Niedermayer wrote:
> On Sat, Nov 25, 2017 at 03:54:56PM -0300, James Almer wrote:
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  libavformat/isom.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> probably ok
> 
> thx

Pushed.
diff mbox

Patch

diff --git a/libavformat/isom.c b/libavformat/isom.c
index 77983c5eaa..9d9f85885b 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -524,7 +524,7 @@  FF_ENABLE_DEPRECATION_WARNINGS
     if (tag == MP4DecSpecificDescrTag) {
         av_log(fc, AV_LOG_TRACE, "Specific MPEG-4 header len=%d\n", len);
         if (!len || (uint64_t)len > (1<<30))
-            return -1;
+            return AVERROR_INVALIDDATA;
         av_free(st->codecpar->extradata);
         if ((ret = ff_get_extradata(fc, st->codecpar, pb, len)) < 0)
             return ret;