RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-23 07:42:51 +00:00
Code Issues Projects Releases Wiki Activity

wav_seek_tag: fix integer overflow

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-06 10:58:31 +02:00
parent 5cb9093aa8
commit 09602dbe7a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/wavdec.c
View File

@ -64,7 +64,9 @@ static int64_t next_tag(AVIOContext *pb, uint32_t *tag)
/* RIFF chunks are always on a even offset. */
static int64_t wav_seek_tag(AVIOContext *s, int64_t offset, int whence)
{
return avio_seek(s, offset + (offset & 1), whence);
offset += offset < INT64_MAX && offset & 1;
return avio_seek(s, offset, whence);
}
/* return the size of the found tag */
@ -366,9 +368,6 @@ static int wav_read_header(AVFormatContext *s)
break;
}
/* skip padding byte */
next_tag_ofs += (next_tag_ofs < INT64_MAX && next_tag_ofs & 1);
/* seek to next tag unless we know that we'll run into EOF */
if ((avio_size(pb) > 0 && next_tag_ofs >= avio_size(pb)) ||
wav_seek_tag(pb, next_tag_ofs, SEEK_SET) < 0) {