| Message ID | 20191107212532.22861-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | e9a335150a62bb377a26ce096187b4476145d02b |
| Headers | show |
On Thu, Nov 07, 2019 at 10:25:31PM +0100, Michael Niedermayer wrote: > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/mp3dec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c > index 258f19174b..6848415657 100644 > --- a/libavformat/mp3dec.c > +++ b/libavformat/mp3dec.c > @@ -91,7 +91,7 @@ static int mp3_read_probe(const AVProbeData *p) > > header = AV_RB32(buf2); > ret = avpriv_mpegaudio_decode_header(&h, header); > - if (ret != 0) > + if (ret != 0 || end - buf2 < h.frame_size) I think it's unneed to do the extra checking, as the buf2 will add the h.frame_size in the next code, it'll break still if buf2 > end for the for condition. > break; > buf2 += h.frame_size; > framesizes += h.frame_size; > -- > 2.23.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Thu, Nov 07, 2019 at 10:25:31PM +0100, Michael Niedermayer wrote: > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/mp3dec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) will apply [...]
On 11/16/2019 7:39 PM, Michael Niedermayer wrote: > On Thu, Nov 07, 2019 at 10:25:31PM +0100, Michael Niedermayer wrote: >> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> >> --- >> libavformat/mp3dec.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > will apply There was a comment/review by Limin Wang you didn't address, unless i missed a reply to some other patch.
On Sun, Nov 17, 2019 at 10:03:03AM -0300, James Almer wrote: > On 11/16/2019 7:39 PM, Michael Niedermayer wrote: > > On Thu, Nov 07, 2019 at 10:25:31PM +0100, Michael Niedermayer wrote: > >> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > >> --- > >> libavformat/mp3dec.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > > > > will apply > > There was a comment/review by Limin Wang you didn't address, unless i > missed a reply to some other patch. Yes, I have reply it in the patch 2/2, it needs the check. > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 258f19174b..6848415657 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -91,7 +91,7 @@ static int mp3_read_probe(const AVProbeData *p) header = AV_RB32(buf2); ret = avpriv_mpegaudio_decode_header(&h, header); - if (ret != 0) + if (ret != 0 || end - buf2 < h.frame_size) break; buf2 += h.frame_size; framesizes += h.frame_size;
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/mp3dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)