History

avformat/matroskadec: Avoid clobbering CodecPrivate size

Andreas Rheinhardt committed 3 years ago

Commit d9897851 parent 007c22c1 file · +2 −3Browse files

Showing the changes to libavformat (1 of 1 file). Show all

Unified · Split

libavformat/matroskadec.c+2−3
@@ -3036,15 +3036,14 @@ static int matroska_parse_tracks(AVFormatContext *s) · 3035 unmodified lines
30363036
30373037 track->codec_priv.size = 0;
30383038 }
3039− track->codec_priv.size -= extradata_offset;
30403039
30413040 if (par->codec_id == AV_CODEC_ID_NONE)
30423041 av_log(matroska->ctx, AV_LOG_INFO,
30433042 "Unknown/unsupported AVCodecID %s.\n", track->codec_id);
30443043
3045− if (!par->extradata && track->codec_priv.size > 0) {
3044+ if (!par->extradata && track->codec_priv.size > extradata_offset) {
30463045 const uint8_t *src = track->codec_priv.data + extradata_offset;
3047− unsigned extra_size = track->codec_priv.size;
3046+ unsigned extra_size = track->codec_priv.size - extradata_offset;
30483047 ret = ff_alloc_extradata(par, extra_size);
30493048 if (ret < 0)
30503049 return ret;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t