virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/vorbisenc: Don't free uninitialized pointers

Browse Source 
The Vorbis encoder allocates several arrays destined to contain pointers
to separately allocated arrays; yet these arrays are allocated without
initializing them: They are uninitialized until their final values
are stored in them; so if allocating one of the earlier subarrays fails,
all of the remaining pointers to subarrays are still uninitialized.
But they are used for freeing, resulting in crashes.

Fix this by zero-initializing the arrays with subarrays.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-05-06 22:01:51 +02:00
parent d919c7165a
commit 44e0a31ac4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/vorbisenc.c
View File

@@ -279,7 +279,7 @@ static int create_vorbis_context(vorbis_enc_context *venc,
venc->log2_blocksize[0] = venc->log2_blocksize[1] = 11; venc->log2_blocksize[0] = venc->log2_blocksize[1] = 11;
venc->ncodebooks = FF_ARRAY_ELEMS(cvectors); venc->ncodebooks = FF_ARRAY_ELEMS(cvectors);
venc->codebooks = av_malloc(sizeof(vorbis_enc_codebook) * venc->ncodebooks); venc->codebooks = av_mallocz(sizeof(vorbis_enc_codebook) * venc->ncodebooks);
if (!venc->codebooks) if (!venc->codebooks)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -318,7 +318,7 @@ static int create_vorbis_context(vorbis_enc_context *venc,
} }
venc->nfloors = 1; venc->nfloors = 1;
venc->floors = av_malloc(sizeof(vorbis_enc_floor) * venc->nfloors); venc->floors = av_mallocz(sizeof(vorbis_enc_floor) * venc->nfloors);
if (!venc->floors) if (!venc->floors)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -335,7 +335,7 @@ static int create_vorbis_context(vorbis_enc_context *venc,
fc->nclasses = FFMAX(fc->nclasses, fc->partition_to_class[i]); fc->nclasses = FFMAX(fc->nclasses, fc->partition_to_class[i]);
} }
fc->nclasses++; fc->nclasses++;
fc->classes = av_malloc_array(fc->nclasses, sizeof(vorbis_enc_floor_class)); fc->classes = av_calloc(fc->nclasses, sizeof(vorbis_enc_floor_class));
if (!fc->classes) if (!fc->classes)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (i = 0; i < fc->nclasses; i++) { for (i = 0; i < fc->nclasses; i++) {
@@ -375,7 +375,7 @@ static int create_vorbis_context(vorbis_enc_context *venc,
return AVERROR_BUG; return AVERROR_BUG;
venc->nresidues = 1; venc->nresidues = 1;
venc->residues = av_malloc(sizeof(vorbis_enc_residue) * venc->nresidues); venc->residues = av_mallocz(sizeof(vorbis_enc_residue) * venc->nresidues);
if (!venc->residues) if (!venc->residues)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -409,7 +409,7 @@ static int create_vorbis_context(vorbis_enc_context *venc,
return ret; return ret;
venc->nmappings = 1; venc->nmappings = 1;
venc->mappings = av_malloc(sizeof(vorbis_enc_mapping) * venc->nmappings); venc->mappings = av_mallocz(sizeof(vorbis_enc_mapping) * venc->nmappings);
if (!venc->mappings) if (!venc->mappings)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);