[FFmpeg-cvslog] avcodec/smacker: Move buffer allocation to later
Michael Niedermayer
git at videolan.org
Mon Jul 7 01:24:29 EEST 2025
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jul 3 03:01:11 2025 +0200| [9899c8c00bb7674fe3cf5c8483b522c6c78e1248] | committer: Michael Niedermayer
avcodec/smacker: Move buffer allocation to later
Reduces allocations on random input
Fixes: 421650030/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SMACKAUD_fuzzer-6144441767493632
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9899c8c00bb7674fe3cf5c8483b522c6c78e1248
---
libavcodec/smacker.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index db464dfcf7..bd08bc7be2 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -641,10 +641,6 @@ static int smka_decode_frame(AVCodecContext *avctx, AVFrame *frame,
"The buffer does not contain an integer number of samples\n");
return AVERROR_INVALIDDATA;
}
- if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
- return ret;
- samples = (int16_t *)frame->data[0];
- samples8 = frame->data[0];
// Initialize
for(i = 0; i < (1 << (bits + stereo)); i++) {
@@ -666,6 +662,12 @@ static int smka_decode_frame(AVCodecContext *avctx, AVFrame *frame,
} else
values[i] = h.entries[0].value;
}
+
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+ return ret;
+ samples = (int16_t *)frame->data[0];
+ samples8 = frame->data[0];
+
/* this codec relies on wraparound instead of clipping audio */
if(bits) { //decode 16-bit data
for(i = stereo; i >= 0; i--)
More information about the ffmpeg-cvslog
mailing list