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

2017-11-25 Thread James Almer 
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 
>> ---
>>  libavformat/isom.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> probably ok
> 
> thx

Pushed.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2017-11-25 Thread Michael Niedermayer 
On Sat, Nov 25, 2017 at 03:54:56PM -0300, James Almer wrote:
> Signed-off-by: James Almer 
> ---
>  libavformat/isom.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

probably ok

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Modern terrorism, a quick summary: Need oil, start war with country that
has oil, kill hundread thousand in war. Let country fall into chaos,
be surprised about raise of fundamantalists. Drop more bombs, kill more
people, be surprised about them taking revenge and drop even more bombs
and strip your own citizens of their rights and freedoms. to be continued


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2017-11-25 Thread James Almer 
Signed-off-by: James Almer 
---
 libavformat/isom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
2.15.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel