From patchwork Sun Dec 18 17:08:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39721 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3342897pzb; Sun, 18 Dec 2022 09:08:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf4zvgQOtuKDmrxffS1rEmSWu+QkhdXA2EdNATyjVnVSO2ty4UPxXBvum0aKYdMHs/2RqLIY X-Received: by 2002:a05:6402:320c:b0:46f:d71c:e732 with SMTP id g12-20020a056402320c00b0046fd71ce732mr36240872eda.31.1671383317216; Sun, 18 Dec 2022 09:08:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671383317; cv=none; d=google.com; s=arc-20160816; b=jnBRnGHpuOrYDXKVKpMQ33OuQ04KuadfFpwRRCMk3zKgraIvba5q2lvPoSSJtZDddr /57EJxRQQrzGbEhXeSgr6OLpgakCaiYZNTw/Oq3G5lhpwNpU7R7wh6VDXehWIjEKlfmg sufwts3Wq824mbWIKpRv9Lem6geonbHNxgqgKaKIpsVzjb0Lr8AiG6d6mA3OzR9/KLXt 0jrmV2Og3XR/zCNRUpkPlDWl0+oMN7ZG1gwaXVd4OxaQC1fRAREY/4GMEYWzFuKsUbAK JCdsFnsyFBOCC0OoaASPoMZHUXs0EqN6K8H+txf0NCoHCqvJSiNV56r0YhuqLlJ5rhVp VmQQ== 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=rw3lO/ZAYWKYXfbWsmczOgGuAQ3KZPlAFdm3Ux1Xxb0=; b=Lbrtlh5j6yWsGJ1D3YnFH/GPiocN+WMT79/f/qREsmA3XVDtcFzp5sEO7pq+VI+FvV u4IDU2Zo9m2ey9B7mpWVsxQCjl9uSJUEcu2IZbGPAbttGijdKvVFKG9jPNevZXoFm7Ny G+qBRREWIrq36vTaLH3G7HJbKc6EZVpT6yP3dJ3wc6OQFSCpfi+tbwD7m5zqDeZ6OJxW mtL63My+m0NI0L68RU7ulAxyOjYsa6eWNCCObGCxrsM0Fo0mXc0txMSQ1GgrVuV5dvxR rv7C9qkatjkDAd4ELxyudjd1583jn9qUV2DUlSyRTV5fdc1HYLLoynvcZauMs37OYyPj xpJA== 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 nb3-20020a1709071c8300b007c082259effsi7428302ejc.101.2022.12.18.09.08.36; Sun, 18 Dec 2022 09:08:37 -0800 (PST) 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 7B18B68B752; Sun, 18 Dec 2022 19:08:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A9DC68A8D9 for ; Sun, 18 Dec 2022 19:08:27 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id E8FBC240004 for ; Sun, 18 Dec 2022 17:08:25 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Dec 2022 18:08:19 +0100 Message-Id: <20221218170823.32130-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/tiff: Check camera_calibration 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: LpO5LYqZpjTH Fixes: division by 0 Fixes: 53926/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5680347889401856 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 41b5a6b7e4..820457fedc 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -2050,8 +2050,10 @@ again: } if (!s->use_color_matrix) { - for (i = 0; i < 3; i++) - s->premultiply[i] /= s->camera_calibration[i][i]; + for (i = 0; i < 3; i++) { + if (s->camera_calibration[i][i]) + s->premultiply[i] /= s->camera_calibration[i][i]; + } } else { for (int c = 0; c < 3; c++) { for (i = 0; i < 3; i++) { From patchwork Sun Dec 18 17:08:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39722 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3343007pzb; Sun, 18 Dec 2022 09:08:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXteJOI50ufAsi3Mw5IDUZefYAOy5eOAASR/SWVB4Quz0dYOGoylE37ef/M4mq9J2MYASiDR X-Received: by 2002:a17:907:d40b:b0:7c0:dd55:1dd4 with SMTP id vi11-20020a170907d40b00b007c0dd551dd4mr7818266ejc.42.1671383326504; Sun, 18 Dec 2022 09:08:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671383326; cv=none; d=google.com; s=arc-20160816; b=CdV5BwU4YTZT2A7Ib3hFSw8HzZWVDQyZ8sHosU6nYMWvYuH8nLN+IqLSxhzRbDwREw nAMQVIDrbwi0BdIWNG4Li6vbMB4hvACX4bXLXRyQ9oftdifcUzjirr9oBYuYqMrjYNUz U9QFimoSjqPddkqlI3XU/tx8WrvGUef8snF6FvPwK2WPxDYB4pfpuG8AiRVBJSLQdSsS MHMzd7i4Y3kVSVZ+ub/6wtOG7Y+zfYOynIplnUqMSO7pQG9bwj2SI9HYg1WFImOiTPCo MuwblZ3vhWzswm1s1K8/KOsuxG955B0JHPsgduWcuFJoUW1ofc2xrqh7NQ5MC1G1CVlj kW6A== 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=OJnVmi5FXqir/jNQQQXSCAKsyiBZvMTVMKzEu4wJOvI=; b=A+oCTwjJ92v10KvDLjNeL9rjk6UgyRZBYk+c7zRXhaKRt4e5Hh8RoTSWpU3EpS5UIR O3oZFjtWhxoL3pmCorNK/5s7/wNaHYn1G7Tt5eXbHTad7bS4jo4qhNYtNjQNO78XWute 9XeJ3aojLsW0lKGj1e8wnSa9nJdQ6sRQeJQVBEXIzFca7Ha6+0bV268IVKvx8fXNmBx3 hEP6V9veQXmPR1ANUZLX2MQsAzfjFh3MV9SNKO9Y37AOL2YIKbBY2oJxINoyWY5kJHH1 2Da+oG/eckadYdmOefPOYYKPUsbw+uxks35KrmVTu1cSaQG958pC3o1csgGpbXGfi4T+ Ex7g== 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 qk8-20020a1709077f8800b0081a9c3ca4c3si1407595ejc.374.2022.12.18.09.08.45; Sun, 18 Dec 2022 09:08:46 -0800 (PST) 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 9155368B8C8; Sun, 18 Dec 2022 19:08:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9073968B556 for ; Sun, 18 Dec 2022 19:08:29 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 88858E0002 for ; Sun, 18 Dec 2022 17:08:28 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Dec 2022 18:08:20 +0100 Message-Id: <20221218170823.32130-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221218170823.32130-1-michael@niedermayer.cc> References: <20221218170823.32130-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/tiff: Prettify code in dng_blit() 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: adQ3c5jgGSQR Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 820457fedc..1a1879de89 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -326,7 +326,7 @@ static void av_always_inline dng_blit(TiffContext *s, uint8_t *dst, int dst_stri scale_factor[i] = s->premultiply[s->pattern[i]] * 65535.f / (s->white_level - s->black_level[i]); } else { for (int i = 0; i < 4; i++) - scale_factor[i] = 65535.f * s->premultiply[i] / (s->white_level - s->black_level[i]); + scale_factor[i] = s->premultiply[ i ] * 65535.f / (s->white_level - s->black_level[i]); } if (is_single_comp) { From patchwork Sun Dec 18 17:08:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39723 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3343098pzb; Sun, 18 Dec 2022 09:08:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf4iQEaWII+REv1IYFpAIT/fC38t6sXuiU/KhH4Wq4FbwOnuu0wX9tQwc9F/vopJBbY5WtCe X-Received: by 2002:a17:906:51d6:b0:7c0:c312:acaa with SMTP id v22-20020a17090651d600b007c0c312acaamr34413549ejk.49.1671383334194; Sun, 18 Dec 2022 09:08:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671383334; cv=none; d=google.com; s=arc-20160816; b=K6qMHWD/LMkxCKXtJeEOn8X5nBvJ/R8Pv/hU9L3467JWJkcyq7NekJMaVSD1Ceg/CR KDuKqiR3uhmRI/Hafbp1FGHYEikDXgstUvK5j9KXTy4cpGnzPcN7TNjG6xuIanwYv9UM 8Ji81FFzJR0VXH1xrf/9/SdT6zxZoaA8/4pYY6ZBQOTd0HCvPxZAEHjGVDTsDLQZFwy5 09mHUyHJc1en3gh7gwrDh79v7DSAw1bDNnTz0wgJdut6W+kccIyocQDiagnUYegXwLMP uTsq/3+WZF1Q7B/jQ3gYmmbua+B9dqI+IwwWE2a+NKsqlDW3awtINdCebk5rlyZFqjMd DNUg== 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=3o8lgrj1mnEnvs+gRlFQYGlCPZ5stR7EtqNlZ05jJM4=; b=RM2v4rJuweHABErcVTh88aqY1Nz4Kdw/m4y5LxO8QwPqZWdi0x4FTRyjRSmY+3Ifsj sbB8G0U75tkiviv/GSx1HAHO3g/Z1xTxZGrfU8iWwacBOaPtahwvoCISX3b04+51dUjk mLfaOzlLSjjot62xQtj2/HKmI9OVjTg/6oiKs9XnvyGNF11gufsLGxgdXBzVQdOoTnOD zLDg8sZ4d4/6N0x4IJwhkP1BDsAAxx+HJ3KdSdWXXEGnE3glewswhW2vcFDalHbXz5Xb xZwpfNV0SSv2R8Atb+i96vjWun8yV6Os6Hlu6k4oIpBRKQlZAYmBoR4MsjroWRqMiLZP Ea2A== 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 g16-20020a1709065d1000b007f1501a8c3esi4206565ejt.511.2022.12.18.09.08.53; Sun, 18 Dec 2022 09:08:54 -0800 (PST) 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 A8C1A68B5A2; Sun, 18 Dec 2022 19:08:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8B9568B8D2 for ; Sun, 18 Dec 2022 19:08:31 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id D73C2240002 for ; Sun, 18 Dec 2022 17:08:30 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Dec 2022 18:08:21 +0100 Message-Id: <20221218170823.32130-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221218170823.32130-1-michael@niedermayer.cc> References: <20221218170823.32130-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/apac: Sanity check bits_per_coded_sample 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: 9PCoHbYgsDGN Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 53931/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APAC_fuzzer-6072913738727424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/apac.c b/libavcodec/apac.c index 030f81adce..2501209681 100644 --- a/libavcodec/apac.c +++ b/libavcodec/apac.c @@ -75,7 +75,9 @@ static av_cold int apac_init(AVCodecContext *avctx) avctx->sample_fmt = AV_SAMPLE_FMT_U8P; if (avctx->ch_layout.nb_channels < 1 || - avctx->ch_layout.nb_channels > 2) + avctx->ch_layout.nb_channels > 2 || + avctx->bits_per_coded_sample > 32U + ) return AVERROR_INVALIDDATA; for (int ch = 0; ch < avctx->ch_layout.nb_channels; ch++) { From patchwork Sun Dec 18 17:08:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39724 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3343198pzb; Sun, 18 Dec 2022 09:09:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf4z3naV8oq84yanSQXFP3KmFxT0DLcMspcY3dFmVY4QfMjj91Q1GoqKMR9cSUBfbt0ovHM7 X-Received: by 2002:a17:906:4ad1:b0:7c0:d0ba:e81f with SMTP id u17-20020a1709064ad100b007c0d0bae81fmr35170357ejt.1.1671383342548; Sun, 18 Dec 2022 09:09:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671383342; cv=none; d=google.com; s=arc-20160816; b=kBTg4MrfGHkNAwC/okcOZEXdCtTlcwvz+2pzdyKgR/+OcwRU3kS4SazAqYEFTI/Gcd xShItFOre9tcTOTyp1KSaroM1qjz4YaIhoV1SAz/nNF4J6zpmjGwtZkhQ5qpHj/0/vhv VJkXAAwT5qkwpgxeXEi4C1RCqTn/TMKCzz60tHxi7rHlNPcX1jj+3RowAMKHmsDaVwGk lHyjA6l0VgNZawtGrpXTStoXnPXOVC0Uz2lTFtiquXZMCaHXp0YEq8AXif7O1fwF7k18 a/5nw54xps9XIrPUk3hwL3ZtYniWI/fcmPlZuP1zfCvhA75Z89ys5Ukms30jQ1tJbRWL e5cw== 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=F90qHbH7XCuSefAsxKROo2AGJAV93r2QIpVSNOsosGU=; b=MWjz2vIU0D/lJBXKPARr0L2kUVyG4gXdwH0Qj87h1goE34cOzFinP5fufWuR0A+eu0 KBcnm3UbkRcOZCRZxfbkJlmBYa09pLjKGqQhrQfm6ADEUapnAYLYfgYMdILyKjwnsW1u /yw5qNaZ2n1Ieo3pXJlu/6EL3/2+TmopIbL32Th+PIiqbibLcWFOhOt2Y5zIn/xhxZAa G4KRJwnwUQJG13gwsu/ciUzCApLBdqQJpWg1dauPPjIOhbFh1f7bRz/2y3ft26k1NF87 Q0A4mIzY0J7Kb2pXUtpgOe43a6gvKFn3muJFPOol0g0dOCwOIGz1xiisW873D5UXMgbR 4gww== 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 qa17-20020a170907869100b007d6105e0acfsi7280254ejc.501.2022.12.18.09.09.02; Sun, 18 Dec 2022 09:09:02 -0800 (PST) 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 B650068B7D5; Sun, 18 Dec 2022 19:08:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2C4668B3EA for ; Sun, 18 Dec 2022 19:08:35 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id D9ACA20004 for ; Sun, 18 Dec 2022 17:08:34 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Dec 2022 18:08:22 +0100 Message-Id: <20221218170823.32130-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221218170823.32130-1-michael@niedermayer.cc> References: <20221218170823.32130-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/h264_slice: Use unsigned for fgs seed computation 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: nFI+vJDXW3Xm Fixes: signed integer overflow: 2147481600 + 13408 cannot be represented in type 'int' Fixes: 53963/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-4650467311616000 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h264_slice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 420758ba0a..6188c74632 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1228,7 +1228,7 @@ static int h264_export_frame_props(H264Context *h) ret = ff_h2645_sei_to_frame(out, &h->sei.common, AV_CODEC_ID_H264, h->avctx, &sps->vui, sps->bit_depth_luma, sps->bit_depth_chroma, - cur->poc + (h->poc_offset << 5)); + cur->poc + (unsigned)(h->poc_offset << 5)); if (ret < 0) return ret; From patchwork Sun Dec 18 17:08:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39725 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3343273pzb; Sun, 18 Dec 2022 09:09:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf6MYUvu+XFHMwQGAAZwQj1KiXi7pCPT1ii84ZcvIaok0g98L5c0SUy9eXn1zuWYKQGZn/X/ X-Received: by 2002:a05:6402:5307:b0:45c:835c:1ebb with SMTP id eo7-20020a056402530700b0045c835c1ebbmr35376371edb.9.1671383351180; Sun, 18 Dec 2022 09:09:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671383351; cv=none; d=google.com; s=arc-20160816; b=kewnfaYHjxjV32pWXnXcsAJDl1MkhLctzvopN4QcIiSfZ/8WJmPAwA72QgoM0TbPVG ct7URJd7ZpB4KHeG0zvPz+UVckFOtXpUSh1nRL2uqVOBsGzJ1aOijO5FxrnNnKlpX74x S7yRkuPj6m9+K57FEy9x8vskXnJbTFSuX2nTn5eRFIxao98+Ygw152LQ3u7PKiRPZQ9H tDUEQIrGVtPrMltr8W+QtHP/XQKa6bts/jhmVuzgx2wgc+XeJU0z2CG/BXJKVLv5olLV t80fn71GyXjjqC/K2QnU8ZH5UZIlQuCergoE8FGxgzx87yv/zvylBuZDVrlomusOsgDb 9+cw== 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=C5bQ0jhtBaxf5r2Y0qBOcfidV6BwY+Fa6duC0HQXsFs=; b=EjS0QhFMEx7rqVjIittHQPDIJVtBDUEidNkzYnDoUBUKq9UVvlkuCQ8NjXEcUXQwmL Ie3a/IT57fcIoY1U50ZDp++U+gCkCs1dQdY9IgDPSrj9SVoXs2hBwR+APk7VvnbwU+rF DdrNoBo9JbQxNGRp/Z5qtr9JOqQNjFv0eFLFRGI6wL4StSGbxWYGoNGDKSsWXs+Klj4/ +XR9KVBi9NQpQqi/LVaa3D7E/CEb9EsIAxSqBl5dT8t68uQI4INuGVdlKyx3NETJ7mJn Z1vwvC040X8Ekkac7oBOubPtdrZuK/WSx6dgVON1RWR0yRuHRY5vH2AFidl4TqXMK9Js yM9A== 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 b13-20020a056402278d00b0046bb45ce1a6si8177884ede.405.2022.12.18.09.09.10; Sun, 18 Dec 2022 09:09:11 -0800 (PST) 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 A5DF468B9FA; Sun, 18 Dec 2022 19:08:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7777468B3EA for ; Sun, 18 Dec 2022 19:08:38 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 6B41D40002 for ; Sun, 18 Dec 2022 17:08:37 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Dec 2022 18:08:23 +0100 Message-Id: <20221218170823.32130-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221218170823.32130-1-michael@niedermayer.cc> References: <20221218170823.32130-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/wavpack: Avoid undefined shift in get_tail() 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: KSVbQiNfqtL0 Fixes: left shift of 1208485947 by 1 places cannot be represented in type 'int' Fixes: 54058/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-5827521084260352 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 3cb4077550..42859ab0a1 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -129,7 +129,7 @@ static av_always_inline unsigned get_tail(GetBitContext *gb, unsigned k) e = (1LL << (p + 1)) - k - 1; res = get_bits_long(gb, p); if (res >= e) - res = (res << 1) - e + get_bits1(gb); + res = ((unsigned)res << 1) - e + get_bits1(gb); return res; }