RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-09 16:19:35 +00:00
Code Issues Projects Releases Wiki Activity

tools/ismindex: Keep count fields consistent with arrays in case of errors

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-06 21:07:50 +01:00
parent d2838f09d6
commit a0a7b154bb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ismindex.c
View File

@ -340,6 +340,7 @@ static int read_tfra(struct Tracks *tracks, int start_index, AVIOContext *f)
track->chunks = avio_rb32(f); track->chunks = avio_rb32(f);
track->offsets = av_mallocz_array(track->chunks, sizeof(*track->offsets)); track->offsets = av_mallocz_array(track->chunks, sizeof(*track->offsets));
if (!track->offsets) { if (!track->offsets) {
track->chunks = 0;
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
@ -448,10 +449,11 @@ fail:
static int get_private_data(struct Track *track, AVCodecContext *codec) static int get_private_data(struct Track *track, AVCodecContext *codec)
{ {
track->codec_private_size = codec->extradata_size; track->codec_private_size = 0;
track->codec_private = av_mallocz(codec->extradata_size); track->codec_private = av_mallocz(codec->extradata_size);
if (!track->codec_private) if (!track->codec_private)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
track->codec_private_size = codec->extradata_size;
memcpy(track->codec_private, codec->extradata, codec->extradata_size); memcpy(track->codec_private, codec->extradata, codec->extradata_size);
return 0; return 0;
} }