From patchwork Thu Jun 22 00:30:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42274 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp2504611pzb; Wed, 21 Jun 2023 17:30:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ58cW44JrR63Jfopgdn9tSWNnBvKShnVnsSbyEhFf98sGBpT/scWC+b8JPtPNfuFI4LxXgL X-Received: by 2002:a17:906:eecd:b0:973:da59:7c91 with SMTP id wu13-20020a170906eecd00b00973da597c91mr15736584ejb.51.1687393852473; Wed, 21 Jun 2023 17:30:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687393852; cv=none; d=google.com; s=arc-20160816; b=SCD8LBhUP58k5p4QzOb6zzKmONATfd3IHxEfd1GMTMJmrbBnVTLnbEF+mgPOV3+2pw EICWX6OFtDs6f72jLVOiVJXy+JIyN9bX7C/kSzMJShvK7ms5GyEnxnZZ4LBpAsSrY0V0 pTFPfDRYnIoXdASqmSvfMN8xoU1tfYX4VEvC+kqEDk91xgx4OSZtvJUPw30yct6wV5vh D4jY31w8UPeb4/ey/BF1BBNOCimHERTPzMg7KIhThDwk92os5pEYuRj0qkwvtA0xfXeK HWQBmiROtXGvAqW5An3KSOtko9VHNTiT0wrzJ6e1HKkCNMvBVnDwaHgQHymNlwtLE7PX OaCg== 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=xtm9sO/tHOkgtz+ji5j/npca1iSjeVGZtwGOV63ISY4=; b=fmCyAJH2oGyCVbY1rUVmdvmW+FR3fe7hl0Il5FguXL+caynFW2bSg5T9FyMYeBKgJM A1G31f0pfFhq7kU1z26iztBxFGlUjhYbNJLXLh3zp6hL2iSO6/0iiTnZziT6kSNZd9sh /zIODmbIwd3jio4BPhAM5Dy437wU0LNEXTdK2PYG1EK1nHkXP4ASA+6SHKo3ukmIzwNJ u6tkN3C/u9hMwQ+WsavXwWwZB0dPaQRoDbevaJee9ThuhFG1Nrxeh48t1pxg8tFDvBv0 F+7fAy//ANjZl/RHR3cTAGx/X/bX2pjyCJbohtekujYCPUJNmIAPAeUMokeCJxUxwQpn S2EQ== 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 b14-20020a05640202ce00b0051892a12c03si2581574edx.99.2023.06.21.17.30.51; Wed, 21 Jun 2023 17:30:52 -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 8FE0168BF38; Thu, 22 Jun 2023 03:30:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-01-1.mymagenta.at (mail-01-1.mymagenta.at [80.109.253.246]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7250768C06F for ; Thu, 22 Jun 2023 03:30:40 +0300 (EEST) Received: from [192.168.232.136] (helo=ren-mail-psmtp-mg02.) by mail-01.mymagenta.at with esmtp (Exim 4.93) (envelope-from ) id 1qC8De-00397b-KF for ffmpeg-devel@ffmpeg.org; Thu, 22 Jun 2023 02:30:38 +0200 Received: from localhost ([84.115.40.24]) by ren-mail-psmtp-mg02. with ESMTP id C8DgqGqO4bZLDC8DgqvdMC; Thu, 22 Jun 2023 02:30:40 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 84.115.40.24 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=64939630 a=4thelYDX6rwh+ygQwvsI+Q==:117 a=4thelYDX6rwh+ygQwvsI+Q==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=0F0uvNKHqajQILr-oW4A:9 a=zZCYzV9kfG8A:10 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 22 Jun 2023 02:30:38 +0200 Message-Id: <20230622003038.20969-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4xfIK6TJan8vuu3dAm9/2Q0YEzkoEqpdekL9nWoPLQWQ6WTc2Dmk6qorIVjO0r8fVhGQ9gDyAA+okbDJv1izJzs7LiTl3mVJI3p58p+gqug9r905eVo4A4 YRt0JJYBV2vXg6rDaexHNnW7BbYZDwDPAG4ElvvEdgGZJSmQc+psrm5unYRyW7y66VGkGtPh7MZ2uA== Subject: [FFmpeg-devel] [PATCH] avcodec/parser: Check next against buffer index 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: GJ1y3TgO+ccQ Fixes: out of array access Fixes: crash-0d640731c7da52415670eb47a2af701cbe2e1a3b Found-by: Catena cyber Signed-off-by: Michael Niedermayer --- libavcodec/parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/parser.c b/libavcodec/parser.c index efc28b8918..db39e698ab 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -214,7 +214,7 @@ int ff_combine_frame(ParseContext *pc, int next, for (; pc->overread > 0; pc->overread--) pc->buffer[pc->index++] = pc->buffer[pc->overread_index++]; - if (next > *buf_size) + if (next > *buf_size || (next < -pc->index && next != END_NOT_FOUND)) return AVERROR(EINVAL); /* flush remaining if EOF */