[FFmpeg-devel] [PATCH 3/4] avformat/wtvdec: Avoid (32bit signed) sectors

[Michael Niedermayer]

On Thu, Jun 13, 2019 at 10:27:00PM +1000, Peter Ross wrote:
> On Thu, Jun 13, 2019 at 01:20:19AM +0200, Michael Niedermayer wrote:
> > Fixes: left shift of negative value -14614752
> > Fixes: 15174/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5670543606415360
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavformat/wtvdec.c | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> > 
> > diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
> > index 890db2e705..706e8ca38d 100644
> > --- a/libavformat/wtvdec.c
> > +++ b/libavformat/wtvdec.c
> > @@ -149,7 +149,7 @@ static int read_ints(AVIOContext *pb, uint32_t *data, int count)
> >   * @param depth         File allocation table depth
> >   * @return NULL on error
> >   */
> > -static AVIOContext * wtvfile_open_sector(int first_sector, uint64_t length, int depth, AVFormatContext *s)
> > +static AVIOContext * wtvfile_open_sector(unsigned first_sector, uint64_t length, int depth, AVFormatContext *s)
> >  {
> >      AVIOContext *pb;
> >      WtvFile *wf;
> > @@ -957,7 +957,8 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p
> >  static int read_header(AVFormatContext *s)
> >  {
> >      WtvContext *wtv = s->priv_data;
> > -    int root_sector, root_size;
> > +    unsigned root_sector;
> > +    int root_size;
> >      uint8_t root[WTV_SECTOR_SIZE];
> >      AVIOContext *pb;
> >      int64_t timeline_pos;
> 
> ok, i see how that can happen on 32-bit.
> please push.

will apply

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Freedom in capitalist society always remains about the same as it was in
ancient Greek republics: Freedom for slave owners. -- Vladimir Lenin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20190614/b1b1f3bb/attachment.sig>