diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2025-07-03 03:01:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2025-07-06 19:20:17 +0200 |
| commit | 9899c8c00bb7674fe3cf5c8483b522c6c78e1248 (patch) | |
| tree | ca4854d5a3cee5d02f6a4f336f90b0c0ab6b390a | |
| parent | 6b028859d969f887d89b6458a92f92f5031c69c8 (diff) | |
| download | ffmpeg-9899c8c00bb7674fe3cf5c8483b522c6c78e1248.tar.gz | |
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@niedermayer.cc>
| -rw-r--r-- | libavcodec/smacker.c | 10 |
1 files 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--) |