From patchwork Thu Jul 29 21:44:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29118 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp6156435ios; Thu, 29 Jul 2021 14:51:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydW4UW6OQvFbdTuap2AqqzfYQciqRGSRYLYaMtOwMt9UzL+Ve/hrRuZqD3BGe80gG1lrOW X-Received: by 2002:a17:907:3e22:: with SMTP id hp34mr6629584ejc.334.1627595467541; Thu, 29 Jul 2021 14:51:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627595467; cv=none; d=google.com; s=arc-20160816; b=qPU7+K3UUNmm2IgPKtprh88z3cKO+Iw93Dc1A6lbDnv7E4jedAI4/1r+sL9ot0P5PA mQ7ipOII6S04kQscjOopKX7Pug2RaSBY/ngwBQW4ouUnai1kQJqr6Na4twafGOcYAumP xYzAap9qzXNAxsQTw/XNp/n7tszcYFJPmtPMOoy1/M6otADpt3CATXGvXlpjyj8pmpn0 vvADwpuJku7cwzxdgRmbPCrYzvc3WAL98Kb/w92CnEsHYm6i868QJ2ewgXQsFjGzKRpA m+fgW4S4824+oZJOgKwLqUsOzGMxwrOMho5BIUZGPHjbD4sgE0Tr6oAVNO6u54xdqvWn Y4Xw== 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=uixymd+S+fARI/tc49ZPD++NK3FqVAonsadM8+R4rpA=; b=diVaoAF+1OcdB/LH3I1lTrZ2gJLAmycLk4an3eGZRIiK5ubB+oPO1w5uDpjNLZdoTL y3bjtQlru/jncTy+Rs0Ui4v18RkrEIQ1pZNkQl91G+dVce7dUBbcOzc1DxTrvFGeVVfN 4Sx8Rm3s6+Y9khyGqkqw3E4gnW3DWkQi1QLKIRmtfzPETOfjo9txD9YfTZCpaW72j4tY DZWd7cwIZOl24o+5arYOxSHowJzNJorsDseF36TkURWLzEooFPh8i6AA2Nq4G5GLUsv0 2cnKisRIbNHPvj40K9XA/9PoUkiC16GDkSopnHcRc6DyUI8dqrN+m5y/Lrq8gGwLLaG4 vFaQ== 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 h19si3785952ejb.11.2021.07.29.14.51.06; Thu, 29 Jul 2021 14:51:07 -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 1D76B689F02; Fri, 30 Jul 2021 00:51:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9498D6806F9 for ; Fri, 30 Jul 2021 00:50:57 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m9DqE-00DpNJ-0H for ffmpeg-devel@ffmpeg.org; Thu, 29 Jul 2021 23:45:22 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 9DpFmn3fNljeH9DpFm6kQZ; Thu, 29 Jul 2021 23:44:22 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=RYMWOOJrMjgWQZlEgGwA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 29 Jul 2021 23:44:21 +0200 Message-Id: <20210729214421.5608-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfPZchUneXfVEeP50lKLNpH5VMPZPuZ0yRCUDw6FPwN5mJC6qEQ1Tlku9TapZE/wbYjXnXCIVPnGwupTPSbTbyp1tMP2cTvjg4TKqLtP4rsqLrFoYlX4o QsgXwYq3OQyQtMSDv+tZVAH1WxfmFbeBdgEo4aBpY3REfxMJz7BlJpS3 Subject: [FFmpeg-devel] [PATCH] avcodec/argo: Check for end of input in decode_alcd() 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: NUJaGrHjyqaK Fixes: reading over the end Fixes: 36346/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-5366943107383296 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/argo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/argo.c b/libavcodec/argo.c index bbdb6ae15f..79a44d2583 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -116,6 +116,8 @@ static int decode_alcd(AVCodecContext *avctx, AVFrame *frame) int index; if (count == 0) { + if (bytestream2_get_bytes_left(gb) < 1) + return AVERROR_INVALIDDATA; codes = bytestream2_get_byteu(&sb); count = 8; }