Browse Source

avformat/smacker: Don't read only one byte at a time

Instead use ffio_read_size to read data into a buffer. Also check that
the desired size was actually successfully read and combine the check
with the check for reading the extradata.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
tags/n4.4
Andreas Rheinhardt 5 years ago
parent
commit
638ef5f758
1 changed files with 5 additions and 8 deletions
  1. +5
    -8
      libavformat/smacker.c

+ 5
- 8
libavformat/smacker.c View File

@@ -215,15 +215,12 @@ static int smacker_read_header(AVFormatContext *s)
for (i = 0; i < smk->frames; i++) {
smk->frm_size[i] = avio_rl32(pb);
}
for (i = 0; i < smk->frames; i++) {
smk->frm_flags[i] = avio_r8(pb);
}

/* load trees to extradata, they will be unpacked by decoder */
ret = avio_read(pb, par->extradata + 16, par->extradata_size - 16);
if (ret != par->extradata_size - 16) {
if ((ret = ffio_read_size(pb, smk->frm_flags, smk->frames)) < 0 ||
/* load trees to extradata, they will be unpacked by decoder */
(ret = ffio_read_size(pb, par->extradata + 16,
par->extradata_size - 16)) < 0) {
av_freep(&smk->frm_size);
return AVERROR(EIO);
return ret;
}

return 0;


Loading…
Cancel
Save