From patchwork Thu Jun 9 21:37:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36100 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp601585pzj; Thu, 9 Jun 2022 14:38:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjg/Y+j2wcsakzf4l7VCL9/UH4X7g1/jekGyKSlgn7HUjJwaAR9GcMk4rgUeP5u/K19m7D X-Received: by 2002:a05:6402:3204:b0:42e:1536:5877 with SMTP id g4-20020a056402320400b0042e15365877mr43941858eda.202.1654810680948; Thu, 09 Jun 2022 14:38:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654810680; cv=none; d=google.com; s=arc-20160816; b=WRXONMVQACFdIPDJNM1PdAeVd9FUr0tdhIY1xdlMp3JElN1eKB5lJMCYYJBwBGQLV8 oSyfn29FVDzHzUJbIWwN4bxbkY+ce64iu/PEbvagTH2zGUqrnQ5hPEvF6MkGMraxQjyX mtxEP6Kbqfv86KmNVv0xSvjRHGN6BXSh8bKnRIZIYnJWdue7Y1c+SsabrWp8BgcMDaJR oUOJpBZcakDDK25hxA/6eazuhCfm1Oy4TFRdJFXfqf5+pFm7u7pvWq3/ZKYmY4tS9UOJ eKLSFKLSGhzx33Xnr4tHi9Gal31cwLAqMSfJl/eBQKJFcnKB+HCeqzT1Y0x8cRiNCRxz qsAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=dPBs/re0tvh+XBUvMT0mV0FE2qjvs4YT+aaGaAT6dJk=; b=nEr98VYUccIvQWLZFg93V54xLU2yvVT5roasaYfKJCuwgnvTV7Ojocj8PiKvIyXjyp b9GHcwi4o33M/zwHvNKUpinyMSzxkB89sWdhngJLa9Zq/44A1S97dasZJrVUppncxtmH xXf0+Wktgzw6ZNmA6PCwvNGjDw+lSvW7l85thec9oLdnt0nzmBmEu1kV+KZ0T6KkBpu3 RvKAk1nyuf1qvgh/57ySy4gn8BkhP0UlCzPyvN3LzkjEqj2iKU5Op4AGDaH478zkRHsu Q9UrFiLZmS9ejmZZLct/GoXsMfE83GFmD1lx6ACRvGSmWTA9edLmCbwKcQeFHKXKUOLM FcxA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d16-20020a056402145000b0042da765d456si6490262edx.141.2022.06.09.14.38.00; Thu, 09 Jun 2022 14:38:00 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E378168B7F0; Fri, 10 Jun 2022 00:37:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-1.mx.upcmail.net (vie01a-dmta-at01-1.mx.upcmail.net [62.179.121.145]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 714DF68B7E0 for ; Fri, 10 Jun 2022 00:37:43 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nzPqZ-00FB6U-1O for ffmpeg-devel@ffmpeg.org; Thu, 09 Jun 2022 23:37:43 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id zPqZnJwgN8s8UzPqZnFkph; Thu, 09 Jun 2022 23:37:43 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id zPqYnT72TOPqFzPqYnei8Q; Thu, 09 Jun 2022 23:37:42 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=62a26826 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=qcW7o6McQzlT5pSNRcQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 9 Jun 2022 23:37:41 +0200 Message-Id: <20220609213741.18029-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220609213741.18029-1-michael@niedermayer.cc> References: <20220609213741.18029-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfIOt2pr7FU2pk9aRUEDfnEmim+QhumTZDAFC0kqZ68qeus/hsFYGvawzBRl9PywjNH/6RXbaFdMieQWa/3WnMrKNtzmEZ3BzA4glYwMsS3OTeGYdhBt1 BNtdnX3UwzGm9PvyFL1ECVAcq9ErIadBnaRjJ8l40TA5TFW4gVMU/6P+1Gx30l5JblEIL2S8oK1QBA== Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/cdgraphics: limit scrolling to the line X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NOkpz4LnUf0r Fixes: out of array access Fixes: 47877/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CDGRAPHICS_fuzzer-5690504626438144 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cdgraphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index b851ec430b..73654019e6 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -240,7 +240,7 @@ static void cdg_scroll(CDGraphicsContext *cc, uint8_t *data, for (y = FFMAX(0, vinc); y < FFMIN(CDG_FULL_HEIGHT + vinc, CDG_FULL_HEIGHT); y++) memcpy(out + FFMAX(0, hinc) + stride * y, in + FFMAX(0, hinc) - hinc + (y - vinc) * stride, - FFMIN(stride + hinc, stride)); + FFABS(stride) - FFABS(hinc)); if (vinc > 0) cdg_fill_wrapper(0, 0, out,