From patchwork Thu Jun 9 21:37:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36099 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp601553pzj; Thu, 9 Jun 2022 14:37:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxTXUg+Kgf8zEFEQ9eHGN1YfIuvFqKBVro+9XBy7Bkhx2uhx8cbfI9FYxyX1EK6zBSRyZ8 X-Received: by 2002:a17:906:a383:b0:6f5:132c:1a14 with SMTP id k3-20020a170906a38300b006f5132c1a14mr38351412ejz.21.1654810673417; Thu, 09 Jun 2022 14:37:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654810673; cv=none; d=google.com; s=arc-20160816; b=cho8TxMH77QBMm3Manl9396rOLess+pSxpwaxHneo4+LhYPNoe5wb1NgncvwfqbPbD G/zvErF3nqv6d+ODf8Sodybgl94rH8x9ne/br6yj7sqTHjn2in34nDq9ANcBJQyqC7GB +ETEHEjxG9PTtBwm9F2f1pmd9135I9xDDA9IN/07VSxUpvktFf2hm9zAvQqYlHnILZCS WYwAJRLu5R+gufrmNUppGXvCu5WGxxfvKwAJbbt/t9nkt5krD+f3sVasWOq7VdfFctdK cHFeAO5awdUU+ibyrmH9oqyoFtKNL9/N0Wc+l8JG4LquJgi8CZXEbkw7pONO40kgKrxQ tt7g== 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:message-id:date:to:from:delivered-to; bh=j+E/Ifw3PpCbRwGKbnKikPS3tCh44H8vaic1JgQ28AU=; b=lkEy5qv1p5NNPj7T16rnz1mHYloQNtfOu8a2I8rUYE5noTZCteKgzt8rLKHmAbxXoV monuWwNe3LoL/XMsDR0N1SUJU2iuzSf0ONyOaxna5CfxJ2D4txt5Vd3RkEtsXKRouxJD AKFhOHPuzXix9aT+OK7GOhwLe/fu+5/bZUogb7DZpVN5T3doMknPsIn+fWxeEJOdWhRy 7vHNMSJqS1hDAVrmpIblq4d7w/moVNPsT41fKoXx990TQoy09eaiotNZ84Mfg4lWFw+R 5KT2VFF8knqyQu5XUzgbueBjQjDIMizC01CExgudGuOJfmDYtsOwm4lycLLKXSygP2G4 jTXQ== 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 7-20020a170906014700b00711fca6bc59si3478336ejh.263.2022.06.09.14.37.52; Thu, 09 Jun 2022 14:37:53 -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 F347568B7D9; Fri, 10 Jun 2022 00:37:49 +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 6EE5968B7D9 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 1nzPqY-00FB6U-Ir for ffmpeg-devel@ffmpeg.org; Thu, 09 Jun 2022 23:37:42 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id zPoxnJuf88s8UzPqYnFkpe; Thu, 09 Jun 2022 23:37:42 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id zPqXndrMd8eSWzPqXnIFFz; Thu, 09 Jun 2022 23:37:41 +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=KKE5sHJo 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=kXhC6kgOofMA7QqXyHAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 9 Jun 2022 23:37:39 +0200 Message-Id: <20220609213741.18029-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfBdXUjTuR4i51I7LnIpIAei8S03Oo0kTfamdr53nNvV5I07RjOiZkmbB7I5rpxoBOSGfp9j1Ewjp9MAlILMhLqf6nqI86jN91NYo06ywLjOCA9uxUImc OPxE3tPag1zNz05pL4yyJk4cC7n9XIzL9tutfM5svlLh32WB0zyU9jyquI8wZeVc5thd/e5swCQppw== Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/jpeglsdec: fix end check for xfrm 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: NQ395PSWXwxC Fixes: out of array access Fixes: 47871/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AMV_fuzzer-5646305956855808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeglsdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 399837cf2f..ab663dc1fc 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -484,19 +484,19 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, for (i = 0; i < s->height; i++) { switch(s->xfrm) { case 1: - for (x = off; x < w; x += 3) { + for (x = off; x + 2 < w; x += 3) { src[x ] += src[x+1] + 128; src[x+2] += src[x+1] + 128; } break; case 2: - for (x = off; x < w; x += 3) { + for (x = off; x + 2 < w; x += 3) { src[x ] += src[x+1] + 128; src[x+2] += ((src[x ] + src[x+1])>>1) + 128; } break; case 3: - for (x = off; x < w; x += 3) { + for (x = off; x + 2 < w; x += 3) { int g = src[x+0] - ((src[x+2]+src[x+1])>>2) + 64; src[x+0] = src[x+2] + g + 128; src[x+2] = src[x+1] + g + 128; @@ -504,7 +504,7 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, } break; case 4: - for (x = off; x < w; x += 3) { + for (x = off; x + 2 < w; x += 3) { int r = src[x+0] - (( 359 * (src[x+2]-128) + 490) >> 8); int g = src[x+0] - (( 88 * (src[x+1]-128) - 183 * (src[x+2]-128) + 30) >> 8); int b = src[x+0] + ((454 * (src[x+1]-128) + 574) >> 8); From patchwork Thu Jun 9 21:37:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36101 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp601954pzj; Thu, 9 Jun 2022 14:38:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/BRmgZQrvhflTUZ4dRlLKG2hu0fqXw9jIsX6461RKmU9WlDbkTyzv/dEtG9KxMVQOPjN0 X-Received: by 2002:a17:906:acb:b0:709:d274:611b with SMTP id z11-20020a1709060acb00b00709d274611bmr38002970ejf.147.1654810737148; Thu, 09 Jun 2022 14:38:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654810737; cv=none; d=google.com; s=arc-20160816; b=awfo40ZiQeKmpyPMDWCwye8Gim3gd0fS+LeEbkV3ONtcHvHf2N7Oi4g/JK9Z0Mg7KL 2PFMP3LcTeqaPNflGT878J+rfGGNblJBXOsz9G+y17UgmH7dnJHIXfhFKlMdYXmsXl2c CF/m+jEMwnLwgkpaFUyElYNkxDRl7O8VqIUQtGBzRogN8ovdvfmcx4cdxEjjS0g11JBY 0LY1su9wkLBQfH4U4BxJqbXTcqUBhYJsAjFBNgm+97XNiOs/7AC1rvAjnmXq9SWyhWlZ OEzQxBaCNny/hIimuR1yz+vcnXMpSsI+fwUTQDpLga7fOe8e/NINsB+F5PmmAStIIrmg +nVg== 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=4qgaVlD522HZAUTEIFJHb20hHnRJl+TTJTlwf8S1/CU=; b=JX0gOC4KKR4rgcLJ9i0qjGpzL9PTTiOsYYfOqeZA3UOf1sXk5vwyHZCO0yiNPU3Aeb sWdzKpq8HIdZD3S4gKGPz4zAIUHCUXZCqvJCciidLhsQzEYmCb/M/okfxpFONC7gh7RO mr/0e2zn6nLhsmzaBkpqZK6zh4EwBWJTIbawQmKUq81K2uhH6Wj2x17YSfLQ39ztEJ3i oCmC1HKOjVx/id0dkRzxGL8D3UvrucA9qsu0eAmzXKUe6UAWX6KpzJ8ryZZ9wxtOQwRT iwpExyYs0MWfzl1o9otnQVN81k9TvdDG/Cygfhh9+tetMGMe/fli8Ffm+mSvAtPPQ57F U35g== 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 ho17-20020a1709070e9100b00711c6a5c5e6si17819954ejc.545.2022.06.09.14.38.56; Thu, 09 Jun 2022 14:38:57 -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 0B6D168B7ED; Fri, 10 Jun 2022 00:38:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1763868B7E0 for ; Fri, 10 Jun 2022 00:38:49 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nzPrW-0008Ci-27 for ffmpeg-devel@ffmpeg.org; Thu, 09 Jun 2022 23:38:42 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id zPoxnJuf88s8UzPrWnFksq; Thu, 09 Jun 2022 23:38:42 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id zPqYndrMt8eSWzPqYnIFG1; 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=KKE5sHJo 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=Ex6i127nCZne-JE3lSgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 9 Jun 2022 23:37:40 +0200 Message-Id: <20220609213741.18029-2-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: MS4wfBE7XS1lrS58kwIRVqjNH2LHTrESVEflAiTCc703pmX7oskCgmb8CIreCufO2BjwKGOAJbSqrqS5tbpaUOGgQ6OR2KcM3GsbN7b6AWcYsqrziWI5uOG2 iKVL0DnFLKrWOzF2otSCt+liDCg1tcAcOuNSGTdUA0gHcjYBAsv0Pc0tSs0uo9AHqtJOb43EDOX2Ug== Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/hevcdsp_template: stay within tables in sao_band_filter() 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: r4v1Gf5clxm7 Fixes: out of array read Fixes: 47875/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5719393113341952 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevcdsp_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c index 56cd9e605d..61425975cd 100644 --- a/libavcodec/hevcdsp_template.c +++ b/libavcodec/hevcdsp_template.c @@ -313,7 +313,7 @@ static void FUNC(sao_band_filter)(uint8_t *_dst, uint8_t *_src, offset_table[(k + sao_left_class) & 31] = sao_offset_val[k + 1]; for (y = 0; y < height; y++) { for (x = 0; x < width; x++) - dst[x] = av_clip_pixel(src[x] + offset_table[src[x] >> shift]); + dst[x] = av_clip_pixel(src[x] + offset_table[(src[x] >> shift) & 31]); dst += stride_dst; src += stride_src; } 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,