summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/vorbisdec.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index dbcc1cd911..d52bfd5d61 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -369,10 +369,15 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc)
}
// Weed out unused vlcs and build codevector vector
- codebook_setup->codevectors = used_entries ? av_mallocz(used_entries *
- codebook_setup->dimensions *
- sizeof(*codebook_setup->codevectors))
- : NULL;
+ if (used_entries) {
+ codebook_setup->codevectors =
+ av_mallocz(used_entries * codebook_setup->dimensions *
+ sizeof(*codebook_setup->codevectors));
+ if (!codebook_setup->codevectors)
+ return AVERROR(ENOMEM);
+ } else
+ codebook_setup->codevectors = NULL;
+
for (j = 0, i = 0; i < entries; ++i) {
unsigned dim = codebook_setup->dimensions;