forked from pool/ffmpeg-7
46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
From 35a6de137a39f274d5e01ed0e0e6c4f04d0aaf07 Mon Sep 17 00:00:00 2001
|
|
From: Jiasheng Jiang <jiashengjiangcool@gmail.com>
|
|
Date: Thu, 10 Jul 2025 16:26:39 +0000
|
|
Subject: [PATCH] libavcodec/alsdec.c: Add check for av_malloc_array() and
|
|
av_calloc()
|
|
|
|
Add check for the return value of av_malloc_array() and av_calloc()
|
|
to avoid potential NULL pointer dereference.
|
|
|
|
Fixes: dcfd24b10c ("avcodec/alsdec: Implement floating point sample data decoding")
|
|
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
|
|
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
---
|
|
libavcodec/alsdec.c | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
|
|
index 734eec8bf8..97b04a95f9 100644
|
|
--- a/libavcodec/alsdec.c
|
|
+++ b/libavcodec/alsdec.c
|
|
@@ -2119,8 +2119,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
|
|
ctx->nbits = av_malloc_array(ctx->cur_frame_length, sizeof(*ctx->nbits));
|
|
ctx->mlz = av_mallocz(sizeof(*ctx->mlz));
|
|
|
|
- if (!ctx->mlz || !ctx->acf || !ctx->shift_value || !ctx->last_shift_value
|
|
- || !ctx->last_acf_mantissa || !ctx->raw_mantissa) {
|
|
+ if (!ctx->larray || !ctx->nbits || !ctx->mlz || !ctx->acf || !ctx->shift_value
|
|
+ || !ctx->last_shift_value || !ctx->last_acf_mantissa || !ctx->raw_mantissa) {
|
|
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
@@ -2132,6 +2132,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
|
|
|
|
for (c = 0; c < channels; ++c) {
|
|
ctx->raw_mantissa[c] = av_calloc(ctx->cur_frame_length, sizeof(**ctx->raw_mantissa));
|
|
+ if (!ctx->raw_mantissa[c]) {
|
|
+ av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
|
|
+ return AVERROR(ENOMEM);
|
|
+ }
|
|
}
|
|
}
|
|
|
|
--
|
|
2.25.1
|
|
|