[FFmpeg-devel] [PATCH 1/3] avcodec/shorten: Clear the additionally allocated space on realloc

[FFmpeg-devel] [PATCH 1/3] avcodec/shorten: Clear the additionally allocated space on realloc

[Michael Niedermayer]

Fixes: use of uninitialized memory
Fixes: 421954767/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-515682786246656

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/shorten.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index ad2e7588d69..bed92936801 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -584,7 +584,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, AVFrame *frame,
         if (avpkt->size) {
             int max_framesize = s->blocksize * s->channels * 8;
             void *tmp_ptr;
-
+            unsigned old_allocated_bitstream_size = s->allocated_bitstream_size;
             tmp_ptr = av_fast_realloc(s->bitstream, &s->allocated_bitstream_size,
                                       max_framesize + AV_INPUT_BUFFER_PADDING_SIZE);
             if (!tmp_ptr) {
@@ -592,9 +592,8 @@ static int shorten_decode_frame(AVCodecContext *avctx, AVFrame *frame,
                 return AVERROR(ENOMEM);
             }
             s->bitstream = tmp_ptr;
-            if (max_framesize > s->max_framesize)
-                memset(s->bitstream + s->max_framesize, 0, (max_framesize - s->max_framesize) +
-                                                            AV_INPUT_BUFFER_PADDING_SIZE);
+            if (s->allocated_bitstream_size > old_allocated_bitstream_size)
+                memset(s->bitstream + old_allocated_bitstream_size, 0, s->allocated_bitstream_size - old_allocated_bitstream_size);
             s->max_framesize = FFMAX(s->max_framesize, max_framesize);
             *got_frame_ptr = 0;
             goto finish_frame;
-- 
2.50.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/3] avcodec/dxvenc: Clear width to linesize not linesize to linesize

[Michael Niedermayer]

Fixes: use of uninitialized memory
Fixes: 422217206/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-4786889444098048

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/dxvenc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c
index f5cef4f2e15..0a2dd8077b7 100644
--- a/libavcodec/dxvenc.c
+++ b/libavcodec/dxvenc.c
@@ -197,8 +197,9 @@ static int dxv_encode(AVCodecContext *avctx, AVPacket *pkt,
                 avctx->height);
 
             if (avctx->width != DXV_ALIGN(avctx->width)) {
+                av_assert0(frame->format == AV_PIX_FMT_RGBA);
                 for (int y = 0; y < avctx->height; y++) {
-                    memset(safe_data[0] + y * safe_linesize[0] + frame->linesize[0], 0, safe_linesize[0] - frame->linesize[0]);
+                    memset(safe_data[0] + y * safe_linesize[0] + 4*avctx->width, 0, safe_linesize[0] - 4*avctx->width);
                 }
             }
             if (avctx->height != DXV_ALIGN(avctx->height)) {
-- 
2.50.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/3] avformat/mxg: clear AV_INPUT_BUFFER_PADDING_SIZE

[Michael Niedermayer]

Fixes: use of uninitialized memory
Fixes: 427532813/clusterfuzz-testcase-minimized-ffmpeg_dem_MXG_fuzzer-5661938917113856

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/mxg.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mxg.c b/libavformat/mxg.c
index 6a39873f213..40139d7d3d9 100644
--- a/libavformat/mxg.c
+++ b/libavformat/mxg.c
@@ -127,6 +127,8 @@ static int mxg_update_cache(AVFormatContext *s, unsigned int cache_size)
 
     mxg->cache_size += ret;
 
+    memset(mxg->buffer_ptr + mxg->cache_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+
     return ret;
 }
 
-- 
2.50.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".