From patchwork Tue Jul 25 00:46:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42962 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp2276536pzb; Mon, 24 Jul 2023 17:46:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlHq+Wx5PUSGRR4tFwlAC0JRbwDlrHkQDsUZm3w1SCn14H6CG/uFQqBJfa9X2g/x+Ad12OTN X-Received: by 2002:a17:906:209e:b0:99b:4ed4:5527 with SMTP id 30-20020a170906209e00b0099b4ed45527mr11807970ejq.25.1690245992366; Mon, 24 Jul 2023 17:46:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690245992; cv=none; d=google.com; s=arc-20160816; b=wbxOBjW1Ezd8hRDNbNUNgQrX/dTjw1FCerLzm2uTM6/ZGIz9koGuhk2EkswFr4aUyt 6DTfeZElhf7PKRGi1k/xuK57R+bTztKB+lutAPy+nlosGgLlCLkXKCweZmH/I6z30ydd OFWlGbYxR9cf7rnzUj2KD6Ei1RPH4WAPySYsqxCB7MV4NK322qRVv8/wArK0xlys2qLe CDvlqhcOSUdyEFZRLulqMeY/knuGkLL/M/XJv5CWojGvvKyohOmMbDZ9jRATqT2jzOaX OepiIWjNXhEVkEq3KZ70LJSndGkRWOPad8g7iUiKSl6WrOr6hd6GgROCjdfUIF/6cJPY 2BCQ== 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=VbZrgezc8Dhu5wMiHOHLsr07BweOi9OK5y6fhtTouj4=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=k2vd6dBugIk4mZpw85umqpePmfvNYxXZjAQyzr7sXlZkwgQyObWdZHhYUcUOKFb9iI wALQkefi+sclcBO/f/rQ5Rq4kBRywnAcs0PY1OMU7yNQqhWkNj/WZB7QCSucYM8+Y1vt PthcPf2fYtUjonayB8z6cKk5He79T1ECQ/8PMi2pN240XR8ofUwE4FhJ9PN+MWYDVBgU ukyJhjPMvUg6YvD2BIrOeQkExo5i9zHV+9m6hIBLTjPKs2uMAeXiSMUiFwRteKefZQsQ 7jK3NAX+Svy5ab+AKRQDzdXwjUXSKGOZzbZ7qwJ/3jRrGITyEotlnBM4avLilMxQ1z5/ a1ZA== 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 d8-20020a170906344800b009924806cd01si7344614ejb.386.2023.07.24.17.46.31; Mon, 24 Jul 2023 17:46:32 -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 E151B68C81D; Tue, 25 Jul 2023 03:46:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0DB568C6CC for ; Tue, 25 Jul 2023 03:46:11 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 26BB9FF802 for ; Tue, 25 Jul 2023 00:46:10 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 25 Jul 2023 02:46:08 +0200 Message-Id: <20230725004609.17750-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230725004609.17750-1-michael@niedermayer.cc> References: <20230725004609.17750-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/cbs_h266_syntax_template: Check num_subpic_cols for 0 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: LPLuILFm4XhY Fixes: division by zero Fixes: 60306/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5538913553612800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cbs_h266_syntax_template.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index dce0216fbc..18ecf17e3b 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1187,6 +1187,8 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, } else { int num_subpic_cols = tmp_width_val / (current->sps_subpic_width_minus1[0] + 1); + if (!num_subpic_cols) + return AVERROR_INVALIDDATA; infer(sps_subpic_ctu_top_left_x[i], (i % num_subpic_cols) * (current->sps_subpic_width_minus1[0] + 1));