From patchwork Sun Sep 5 19:24:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30009 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3153269iov; Sun, 5 Sep 2021 12:25:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtUt0jjRqWpXDlNuod7ITr5/CZSAtF5xDDQAqJI74QDUcydmOxkH0ygBEvLlgRmXEU56gY X-Received: by 2002:a17:906:c52:: with SMTP id t18mr9981625ejf.148.1630869940924; Sun, 05 Sep 2021 12:25:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630869940; cv=none; d=google.com; s=arc-20160816; b=UE29tG3LafzT0QOtmExdyJl3rDgbPIYFvL/oQ1X9t9vtDbLZrtIi27mgqcK9NdxwPE j51z1A3rsZv/E9rtWNfzn5kmrNPQFyF5K0OJY3RXD/CIjzur4L48jW0b6hLbPTzMjOZm wzQErOIXTYDZDBYLIEL0vioBjlfkgywa81/wk0f5vThVRhYUfnTpLqVwNoO8YqrxsPpE JNZbivrk9HLcKUnVV9Wcz69wztVxs4idFVBz6xNwyjLbNTE0WnsXUBxaQh057ScbrnM6 YBjTNo7SOWZBq92FdpEkMuPPRNTHY99F/cGMyU2t+6efKZ/obCwr5RhfByYqmgZh4xUb vEng== 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=/6rdYaFvxOlLf2eAawc1O1imJ+H5DcsWXBuEQ3atIhE=; b=zQM559mf5SxPmWQc2Dv0cEp3xm2UAgb3oCmZb0qCfwi/R1zBLaFwXsMacLjcBt9i6o NdhRbklU+YjJzYjsgICYSNy8v7pCuuCu0/kRpR8ma4CI2+RKhIeDFrLxphkvARzEnWGn NWdxYe4ndD6DEpCNapwiiFdfsfdObjtBaAZsa3Qfqz7YLB8y2q+7TQkpJSRqyRtlzbN1 gjgvrlbt77RXR6Zmert4yLSb0BVbL4TRecRH6RzWSP00r0SIhQMT37Nyo2x40wsS84NN Qy6VWUfTNZ/hYbabvtmIlvKVxs2jQozCfrALU/8GSecRiO9YeWB6vadOP7j4fbKHMvSh 1TXg== 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 c2si6421162eds.210.2021.09.05.12.25.40; Sun, 05 Sep 2021 12:25:40 -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 65EA468A62A; Sun, 5 Sep 2021 22:25:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4821268998C for ; Sun, 5 Sep 2021 22:25:19 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mMxlW-00G11W-8O for ffmpeg-devel@ffmpeg.org; Sun, 05 Sep 2021 21:25:18 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id MxkYmmGKBljeHMxkYmkPG0; Sun, 05 Sep 2021 21:24:18 +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=6tO2eCvWnai8Nwv4QPcA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Sep 2021 21:24:17 +0200 Message-Id: <20210905192418.25970-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210905192418.25970-1-michael@niedermayer.cc> References: <20210905192418.25970-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJg/6YdBNNcXgRPbRd54Plv8bUq8I0GsOM4aReM1yfeoWxA+oe/Wo8/Ya5iikLvv0Ey6P+rTIp0jgztKeADkFwNyvYS2aEjZKNFQHisx9Xi0u4fkVC5y ET6TakizHLP4DwuX6bd9sBssntWjO6ApDJmr8G+S08PmFpQYylHcTGKA Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/h264_parser: Fix nalsize check 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: Q4JZwunOXB6p Fixes: Assertion failure Fixes: 37463/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-4914693494931456 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h264_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 01ea016409..47cc1d5c78 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -87,7 +87,7 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, i = next_avc; for (j = 0; j < p->nal_length_size; j++) nalsize = (nalsize << 8) | buf[i++]; - if (!nalsize || nalsize > buf_size - i) { + if (!nalsize || i > buf_size || nalsize > buf_size - i) { av_log(logctx, AV_LOG_ERROR, "AVC-parser: nal size %"PRIu32" " "remaining %d\n", nalsize, buf_size - i); return buf_size;