Commit 09602dbe authored by Michael Niedermayer's avatar Michael Niedermayer

wav_seek_tag: fix integer overflow

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 5cb9093a
...@@ -64,7 +64,9 @@ static int64_t next_tag(AVIOContext *pb, uint32_t *tag) ...@@ -64,7 +64,9 @@ static int64_t next_tag(AVIOContext *pb, uint32_t *tag)
/* RIFF chunks are always on a even offset. */ /* RIFF chunks are always on a even offset. */
static int64_t wav_seek_tag(AVIOContext *s, int64_t offset, int whence) 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 */ /* return the size of the found tag */
...@@ -366,9 +368,6 @@ static int wav_read_header(AVFormatContext *s) ...@@ -366,9 +368,6 @@ static int wav_read_header(AVFormatContext *s)
break; 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 */ /* seek to next tag unless we know that we'll run into EOF */
if ((avio_size(pb) > 0 && next_tag_ofs >= avio_size(pb)) || if ((avio_size(pb) > 0 && next_tag_ofs >= avio_size(pb)) ||
wav_seek_tag(pb, next_tag_ofs, SEEK_SET) < 0) { wav_seek_tag(pb, next_tag_ofs, SEEK_SET) < 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment