diff mbox series

[FFmpeg-devel] avcodec/cbs_jpeg: Fix uninitialized end index in cbs_jpeg_split_fragment()

Message ID 20200710175244.30666-1-michael@niedermayer.cc
State Accepted
Commit 4a10bc8f6f5d600c44ecb9b43cd9abf13bf3bfae
Headers show
Series [FFmpeg-devel] avcodec/cbs_jpeg: Fix uninitialized end index in cbs_jpeg_split_fragment() | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Michael Niedermayer July 10, 2020, 5:52 p.m. UTC 
Fixes: Out of array read
Fixes: 24043/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5084566275751936.fuzz

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

Comments

Michael Niedermayer July 10, 2020, 6:23 p.m. UTC | #1 
On Fri, Jul 10, 2020 at 07:52:44PM +0200, Michael Niedermayer wrote:
> Fixes: Out of array read
> Fixes: 24043/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5084566275751936.fuzz
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/cbs_jpeg.c | 1 +
>  1 file changed, 1 insertion(+)

will apply and backport

[...]
diff mbox series

Patch

diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c
index 09329434e4..7d3e10fcc8 100644
--- a/libavcodec/cbs_jpeg.c
+++ b/libavcodec/cbs_jpeg.c
@@ -149,6 +149,7 @@  static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx,
             break;
         } else if (marker == JPEG_MARKER_SOS) {
             next_marker = -1;
+            end = start;
             for (i = start; i + 1 < frag->data_size; i++) {
                 if (frag->data[i] != 0xff)
                     continue;