Browse Source

avformat/nutdec: check avio_read() return code

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f2785ab8669_6838_mewmew_vorbis_ssa.nut
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
71fe97a60a
1 changed files with 7 additions and 1 deletions
  1. +7
    -1
      libavformat/nutdec.c

+ 7
- 1
libavformat/nutdec.c View File

@@ -970,6 +970,7 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code)
int64_t pts, last_IP_pts;
StreamContext *stc;
uint8_t header_idx;
int ret;

size = decode_frame_header(nut, &pts, &stream_id, &header_idx, frame_code);
if (size < 0)
@@ -1006,7 +1007,12 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code)
pkt->size -= sm_size;
}

avio_read(bc, pkt->data + nut->header_len[header_idx], size);
ret = avio_read(bc, pkt->data + nut->header_len[header_idx], size);
if (ret != size) {
if (ret < 0)
return ret;
av_shrink_packet(pkt, nut->header_len[header_idx] + size);
}

pkt->stream_index = stream_id;
if (stc->last_flags & FLAG_KEY)


Loading…
Cancel
Save