Don't use the avio-API to read a few bytes at fixed offsets.
Unified · Split
| @@ -2660,18 +2660,18 @@ static int matroska_parse_tracks(AVFormatContext *s) · 2659 unmodified lines | |||
| 2660 | codec_id == AV_CODEC_ID_ATRAC3 || | 2660 | codec_id == AV_CODEC_ID_ATRAC3 || |
| 2661 | codec_id == AV_CODEC_ID_SIPR) | 2661 | codec_id == AV_CODEC_ID_SIPR) |
| 2662 | && track->codec_priv.data) { | 2662 | && track->codec_priv.data) { |
| 2663 | const uint8_t *ptr = track->codec_priv.data; | ||
| 2663 | int flavor; | 2664 | int flavor; |
| 2664 | 2665 | ||
| 2665 | ffio_init_context(&b, track->codec_priv.data, | 2666 | if (track->codec_priv.size < 46) |
| 2666 | track->codec_priv.size, | 2667 | return AVERROR_INVALIDDATA; |
| 2667 | 0, NULL, NULL, NULL, NULL); | 2668 | ptr += 22; |
| 2668 | avio_skip(&b, 22); | 2669 | flavor = bytestream_get_be16(&ptr); |
| 2669 | flavor = avio_rb16(&b); | 2670 | track->audio.coded_framesize = bytestream_get_be32(&ptr); |
| 2670 | track->audio.coded_framesize = avio_rb32(&b); | 2671 | ptr += 12; |
| 2671 | avio_skip(&b, 12); | 2672 | track->audio.sub_packet_h = bytestream_get_be16(&ptr); |
| 2672 | track->audio.sub_packet_h = avio_rb16(&b); | 2673 | track->audio.frame_size = bytestream_get_be16(&ptr); |
| 2673 | track->audio.frame_size = avio_rb16(&b); | 2674 | track->audio.sub_packet_size = bytestream_get_be16(&ptr); |
| 2674 | track->audio.sub_packet_size = avio_rb16(&b); | ||
| 2675 | if (track->audio.coded_framesize <= 0 || | 2675 | if (track->audio.coded_framesize <= 0 || |
| 2676 | track->audio.sub_packet_h <= 0 || | 2676 | track->audio.sub_packet_h <= 0 || |
| 2677 | track->audio.frame_size <= 0) | 2677 | track->audio.frame_size <= 0) |