Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/iff: fix deadlock in parsing dsd chunks

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
pull/208/merge
Paul B Mahol 9 years ago
parent d171cd076f
commit 675cfb2f86
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavformat/iff.c

4
libavformat/iff.c
Unescape View File

@ -209,7 +209,7 @@ static int parse_dsd_diin(AVFormatContext *s, AVStream *st, uint64_t eof)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
while (avio_tell(pb) + 12 <= eof) { while (avio_tell(pb) + 12 <= eof && !avio_feof(pb)) {
uint32_t tag = avio_rl32(pb); uint32_t tag = avio_rl32(pb);
uint64_t size = avio_rb64(pb); uint64_t size = avio_rb64(pb);
uint64_t orig_pos = avio_tell(pb); uint64_t orig_pos = avio_tell(pb);
@ -243,7 +243,7 @@ static int parse_dsd_prop(AVFormatContext *s, AVStream *st, uint64_t eof)
int dsd_layout[6]; int dsd_layout[6];
ID3v2ExtraMeta *id3v2_extra_meta; ID3v2ExtraMeta *id3v2_extra_meta;
while (avio_tell(pb) + 12 <= eof) { while (avio_tell(pb) + 12 <= eof && !avio_feof(pb)) {
uint32_t tag = avio_rl32(pb); uint32_t tag = avio_rl32(pb);
uint64_t size = avio_rb64(pb); uint64_t size = avio_rb64(pb);
uint64_t orig_pos = avio_tell(pb); uint64_t orig_pos = avio_tell(pb);

Write Preview
Loading…
Cancel
Save