Re: [FFmpeg-devel] [PATCH 1/9] 4xm: prevent overflow during block alignment calculation

2017-01-28 Thread Andreas Cadhalpun 
On 26.01.2017 03:21, Michael Niedermayer wrote:
> On Thu, Jan 26, 2017 at 02:11:02AM +0100, Andreas Cadhalpun wrote:
>> Signed-off-by: Andreas Cadhalpun 
>> ---
>>  libavformat/4xm.c | 5 -
>>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> LGTM
> 
> thx

Pushed.

Best regards,
Andreas

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

Re: [FFmpeg-devel] [PATCH 1/9] 4xm: prevent overflow during block alignment calculation

2017-01-25 Thread Michael Niedermayer 
On Thu, Jan 26, 2017 at 02:11:02AM +0100, Andreas Cadhalpun wrote:
> Signed-off-by: Andreas Cadhalpun 
> ---
>  libavformat/4xm.c | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)

LGTM

thx

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

Frequently ignored answer#1 FFmpeg bugs should be sent to our bugtracker. User
questions about the command line tools should be sent to the ffmpeg-user ML.
And questions about how to use libav* should be sent to the libav-user ML.


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

[FFmpeg-devel] [PATCH 1/9] 4xm: prevent overflow during block alignment calculation

2017-01-25 Thread Andreas Cadhalpun 
Signed-off-by: Andreas Cadhalpun 
---
 libavformat/4xm.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index 2758b69d29..ead6d2b424 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -29,6 +29,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "libavutil/intfloat.h"
+#include "libavcodec/internal.h"
 #include "avformat.h"
 #include "internal.h"
 
@@ -153,8 +154,10 @@ static int parse_strk(AVFormatContext *s,
 fourxm->tracks[track].audio_pts   = 0;
 
 if (fourxm->tracks[track].channels<= 0 ||
+fourxm->tracks[track].channels > FF_SANE_NB_CHANNELS ||
 fourxm->tracks[track].sample_rate <= 0 ||
-fourxm->tracks[track].bits<= 0) {
+fourxm->tracks[track].bits<= 0 ||
+fourxm->tracks[track].bits > INT_MAX / FF_SANE_NB_CHANNELS) {
 av_log(s, AV_LOG_ERROR, "audio header invalid\n");
 return AVERROR_INVALIDDATA;
 }
-- 
2.11.0
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel