diff options
Diffstat (limited to 'libavformat/oggparsespeex.c')
| -rw-r--r-- | libavformat/oggparsespeex.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c index 2430cd742b..434b0fdab1 100644 --- a/libavformat/oggparsespeex.c +++ b/libavformat/oggparsespeex.c @@ -62,6 +62,11 @@ static int speex_header(AVFormatContext *s, int idx) { st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_SPEEX; + if (os->psize < 68) { + av_log(s, AV_LOG_ERROR, "speex packet too small\n"); + return AVERROR_INVALIDDATA; + } + st->codecpar->sample_rate = AV_RL32(p + 36); st->codecpar->channels = AV_RL32(p + 48); if (st->codecpar->channels < 1 || st->codecpar->channels > 2) { @@ -76,9 +81,8 @@ static int speex_header(AVFormatContext *s, int idx) { if (frames_per_packet) spxp->packet_size *= frames_per_packet; - st->codecpar->extradata_size = os->psize; - st->codecpar->extradata = av_malloc(st->codecpar->extradata_size - + AV_INPUT_BUFFER_PADDING_SIZE); + if (ff_alloc_extradata(st->codecpar, os->psize) < 0) + return AVERROR(ENOMEM); memcpy(st->codecpar->extradata, p, st->codecpar->extradata_size); avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); |