RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

brstm: also allocate b->table in read_packet 

This fixes NULL pointer dereferencing if the codec is forced to
adpcm_thp even though a different one was detected.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit bcf4ee26a0)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun 2016-01-04 12:53:20 +01:00
parent a90a7594a8
commit cdedd71a7e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/brstm.c
View File

@ -263,6 +263,10 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
if (!b->adpc) { if (!b->adpc) {
av_log(s, AV_LOG_ERROR, "adpcm_thp requires ADPC chunk, but none was found.\n"); av_log(s, AV_LOG_ERROR, "adpcm_thp requires ADPC chunk, but none was found.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (!b->table) {
b->table = av_mallocz(32 * codec->channels);
if (!b->table)
return AVERROR(ENOMEM);
} }
if (av_new_packet(pkt, 8 + (32 + 4) * codec->channels + size) < 0) if (av_new_packet(pkt, 8 + (32 + 4) * codec->channels + size) < 0)