From patchwork Mon May 13 01:20:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48833 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp61366pzb; Sun, 12 May 2024 18:20:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUWCs+JxPgcHExHfuCVAeKwjhpeH3bCFmRNoaW8ZxyXZagwbKNc54xiPXvtAAgn3bwi8Q765EjQi1ArWP9Uf7ZYuGYF/jhhWmfU8Q== X-Google-Smtp-Source: AGHT+IHiVHcce1cUUy+WAo3e8h/PrDFFmmbrifG+awy+Ke2LNdkN8VU80Q2zAEFN0ARwwOEl2EBM X-Received: by 2002:a50:8e0d:0:b0:572:a731:dd1d with SMTP id 4fb4d7f45d1cf-5734d5ebafdmr7680775a12.25.1715563226701; Sun, 12 May 2024 18:20:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715563226; cv=none; d=google.com; s=arc-20160816; b=T2a+zisLRnNrLg9/KCxtj07+wUreA0yfDu0qjTzqnMF4x5tUcX8W3pPe0RXr83xlKm bF2xJghY56dE7nl4P5235pnRK5DAqlIyb1t2wRCaHMimGccg0b3Kgiv55EETgPZx5iVC F3DAw2IiqTSbs+yNQlWKhG0ezW31AXXZBbQ18ljnLc9WyWS+4ob9Y/VkW88WJW+PIJ9f k0Rfjvh2qfqlvz2H5OYsYkYrvLE/nWygVo0Sm2Y8bc5ThfhS9gNKclCX+gjtPdJaEc1q CIelcwXwa6SqsiaBR1o7R9MUU/SfcKMPyhY60HXB+1x4+BZ5syzK9T4RddLwrPuXm/oU WZ9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=LyycYzcI9/RtgNFAX67Fr0IqNDwK92YsTAB7vxDU7R0=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=H3PxpR11PscPoMAJDIc9vTzFFxqJvNM8+25M4UGfjpILVcivlUPMu6CBiMALT2rugb OzEcugQTaHQGO5XDH2zHnTDoCzwVgqrOmKr08tVBXCRJUQLEf5iOO+fWV5d0gmPps/Yw Hz8TVSfY83G4qhP2bDm/UNE6e8gmk1I5KNgmr2DP85GRUkJryLrKrJ/mmZJJCrXCeTQq AcIw5YKuyiBfKrRZlNkQ3L09OdY6H4pkXORvAofDebCpxTqS8oOQVWOqZVSolPXinxmo 3Tsr0bzCwWwOPTZMQusxGNXaG5gacDMOuaYu0Y7cdw73/I9er+Lmxd2mBywpgjUAPOsA CExw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=e+cTBiZR; 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 4fb4d7f45d1cf-574b6bd8904si1603173a12.120.2024.05.12.18.20.25; Sun, 12 May 2024 18:20:26 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=e+cTBiZR; 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 0E1A768CD95; Mon, 13 May 2024 04:20:21 +0300 (EEST) 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 54C4668CF4C for ; Mon, 13 May 2024 04:20:14 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5E6DE20002 for ; Mon, 13 May 2024 01:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1715563213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=j1XFU8e5ApQO6kidz1W2DZsnR8WhMukh11uNFULwK/U=; b=e+cTBiZRexThFK0dmzK0x1Mvo4kmDofAM0f9/YRav9I8z0myr8NtD4zktMwi4mPMWVp5Kj Cb85vcMGHnrk3O/GCXLdzygQl36q6AyA6+gd9OAWumDHVLCvmXFGlkeJeRFnPs/Pnw097a saMAPYG94SVBdnP+dxJmFZRqNVCITbtLVZrNm0Y47d+dsJezFhkZNvpJLKJVS64eP06jz/ ZHIXzRnNk5K6DZwdiB4sGKRpmSaIlzaGcCXiz2vwyLFv3A661X4WOrtE8vcm4IjyTf8ZJy DN0JJqEs1+gMqnL9Tzl25n76ZDRmHHTK2MHwlV6XnDhJb2c9NeoGPT/Hx1DapA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 13 May 2024 03:20:08 +0200 Message-ID: <20240513012011.1049366-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/notchlc: Check init_get_bits8() for failure 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HaQuGVpE/uif Fixes: CID1500300 Unchecked return value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/notchlc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/notchlc.c b/libavcodec/notchlc.c index 6dd3f884407..30427f4ba92 100644 --- a/libavcodec/notchlc.c +++ b/libavcodec/notchlc.c @@ -243,7 +243,9 @@ static int decode_blocks(AVCodecContext *avctx, AVFrame *p, bytestream2_seek(&dgb, s->y_data_offset + row_offset, SEEK_SET); - init_get_bits8(&bit, dgb.buffer, bytestream2_get_bytes_left(&dgb)); + ret = init_get_bits8(&bit, dgb.buffer, bytestream2_get_bytes_left(&dgb)); + if (ret < 0) + return ret; for (int x = 0; x < avctx->width; x += 4) { unsigned item = bytestream2_get_le32(gb); unsigned y_min = item & 4095; From patchwork Mon May 13 01:20:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48832 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp61397pzb; Sun, 12 May 2024 18:20:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXzvkJxpz5kdFaDEQKWjNAq/T+lFkPMvzqqRyOJcOfLTn7RPAG5xdrdybLn9nqWtoi4GkRrnk02bsseaHoDTlbfoNlZFS7iawgL0Q== X-Google-Smtp-Source: AGHT+IHeSJMtnwvxg+Yjjct1v37YFAICj2Ky5OzpM/bdFcrUNpPQLpLacbnjICzXkuVqYWQfw8sB X-Received: by 2002:a17:906:1c10:b0:a59:9b75:b84 with SMTP id a640c23a62f3a-a5a2d5d4492mr505306766b.35.1715563237139; Sun, 12 May 2024 18:20:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715563237; cv=none; d=google.com; s=arc-20160816; b=cUlRgDqTr39b/39qfddXqe7yXMNauKiXXxQZwIGVMYnsIlRWACCD6KwAhM8ICJIIJ6 Xyv6SY2POoyByl2xxq0rqLENMg39H+DVyAf15VjHVz1mxzkL7ybQBnHoNW4V6XF8T7DJ TZ26xrywm04TNd35egzDSN6Sq6fFum/AcER1O7CqBgdjp6k0CBFEkr2D+NcWsqk+jqIV kBRAggNoLS8Jxr88v3vfoTvRMrNPEMpAVuXJxCQYUmuiwZIul8iz1HJmKhLfMXrCYtZY EPJUjUWjbPCnT0ewvULobs+LFiiTyVAvvEUh2IKPDTlYO9Lme49nTev451ItnwK/u0zd 62eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=hOHQYSXzsnRyYWiCyvi3QQxetog2M02dz5S/GT8jI54=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=AYRkq+8l+CpDt95MXYZblJ0cm3i6VJTJGurbjRnbB1mnVfv296m/NAJoXekOLl1N5R 4dKvRnXKQFnd05r2UbQFyslC7PfyYT5ZaDc5Q8yRzrMZH9iECEkLxSyPmEVMOjlSFCZC ZYuwmyea/D2AdlpTNngSi5IFgr91PI4XzND1aQqgK65RZK9Tm0VJeQ68uMkY+MpMsr+U bG30oT1Aebi8KC/1yWCbNIZpk37bB378Yu9IGIWx9jbq6UEFBTaG5ZD77waudvrzezdH Zdw1af4B11QF7jXxTx6J59gzWkA3ERwusfG9/f3L0gz2OF1YppXeAIevM5mwPr5LWwvD COkw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=mi5IIuQa; 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 a640c23a62f3a-a5a17be669dsi447038366b.747.2024.05.12.18.20.36; Sun, 12 May 2024 18:20:37 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=mi5IIuQa; 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 7412068D48C; Mon, 13 May 2024 04:20:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45CC568D2E3 for ; Mon, 13 May 2024 04:20:15 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 867C360002 for ; Mon, 13 May 2024 01:20:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1715563214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fZFh++mMr7PkJOkYYBzB7uSyJpgpqO8+qOkJG+i6OPw=; b=mi5IIuQalQCF5qRjOHhW+1aCYSKbdgRddOFOD+uvAlJiAJjeeiUe6oj15mW4l/gtknafKO ROhnyXhvrQ5psYB5kYSVASXT/NCkJ5o1+SaH4qOqlY92D5TI2r01B8uc9ct42CFFYffnRb 4GAGUfieEvUSvozKft3tQtyzJXFsrdt9aPgglj/Ejn2sPlCK3/uMA4S8fUWenfmYEyMSH3 pmIIRxy7VJRfdgt/syD6Ewckt5bK6lhbyD/HxdepgaxNKW3WYrs+rd8qELagaLbD0OB4MN VcH/XcbrloY1o1BkDxcHdxDdbUxlcGDGxMUZuMd8EP/yXhid318EtGmQqz3XOA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 13 May 2024 03:20:09 +0200 Message-ID: <20240513012011.1049366-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240513012011.1049366-1-michael@niedermayer.cc> References: <20240513012011.1049366-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/pcm-dvdenc: 64bit pkt-size 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DEQeUPBuZjPi It seems nothing prevents such overflow even though odd Fixes: CID1441934 Unintentional integer overflow Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/pcm-dvdenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pcm-dvdenc.c b/libavcodec/pcm-dvdenc.c index 1e7ee644f66..71e9b6915ad 100644 --- a/libavcodec/pcm-dvdenc.c +++ b/libavcodec/pcm-dvdenc.c @@ -116,7 +116,7 @@ static int pcm_dvd_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, { PCMDVDContext *s = avctx->priv_data; int samples = frame->nb_samples * avctx->ch_layout.nb_channels; - int64_t pkt_size = (frame->nb_samples / s->samples_per_block) * s->block_size + 3; + int64_t pkt_size = (int64_t)(frame->nb_samples / s->samples_per_block) * s->block_size + 3; int blocks = (pkt_size - 3) / s->block_size; const int16_t *src16; const int32_t *src32; From patchwork Mon May 13 01:20:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48834 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp61418pzb; Sun, 12 May 2024 18:20:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW21TYsiPCOpRl1LLYKig+TrgH5mkc7AUJKaSK9I2B2h+jZgdCKwxepGocHhmwnYCoNAKc/1hxZ5Lj8+UbofZi469OPwJkHfIzlSg== X-Google-Smtp-Source: AGHT+IFIJBZD7Isb6/OfsoeXinssvZu24Rt5WYCHf9wXKEJCxOWCPr3rGHk/P/dyIBjMFg1uz7V1 X-Received: by 2002:a17:906:27c7:b0:a59:a48e:34 with SMTP id a640c23a62f3a-a5a2d57acf6mr834915966b.32.1715563246157; Sun, 12 May 2024 18:20:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715563246; cv=none; d=google.com; s=arc-20160816; b=WszlLdVLIlgEEAsYB1iXTZOf0VbX1v59RkZ8Hl49OPnjQrmcuJOJOZtNlgZ61E9d+Y GvZWU7ujFRT4zuEY/9wgL1EbwrYqlEmFny2SCv7RB+dMyreVAKyoAZP2F9vvMLWooPD+ /f3J9eA0xUHa/t6YUXQ5s1jZEm8UiHDwOHaj6hRZbO09KGl8W5WcrLudORRDXU4Hyo3r 9RKWDz2veNY5yBLYRKD7bdB2k2CHacMOzD3BZYAxdBbMNkNPXtWqj1HZsuftMQSYpkBv GfkJgLEkXqvEHb00TjsG/+kmFQkyrul0yfkjoF4Sg4OcwFO1LuIlIlPYb0Vn/TYOIHgI Vdgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=mo5wosmw5sd4Ybe2UKvEDAHbwCO+372XTzGlnG8S8os=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=mLD9p7Rbd55BT540RN4YLii19cOxRZTW6U8kNUt4Gj0oHNnN+4qtrqnQQWc3MwHCAx DuwYn0crHwbn4s56WALCHTbXqUTiwIZUYh1M9dZ4i/G/47AyfI6g9yje2LwqYRRvBAUh w9gfueBS+NSGF7bHBnCgN79C+zJeQNNn3w1SP0UJSD8WZAvrL8xAWqca0x+DVOMw96mL 0T+zYexlUWCu4Oiku/3wXclgGjmXmkP3R1OvzbsC5lf/ntMq/E2TFiiqPdGi5FQU/szu WnZSN2FkufhL+/qor19rW01HFrkp+pAIYd4JyQKInMmhDF2aJl+7ddq7qg6OYDydeBHh YKag==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=I9b5lE7v; 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 a640c23a62f3a-a5a1793c2dasi461953566b.141.2024.05.12.18.20.45; Sun, 12 May 2024 18:20:46 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=I9b5lE7v; 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 754F768D603; Mon, 13 May 2024 04:20:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A2F468D3FA for ; Mon, 13 May 2024 04:20:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B6F271BF204 for ; Mon, 13 May 2024 01:20:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1715563216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GJnLiuRvg0WCFSElrEk9WOARhr5M7l3pYBnOpxzEMzw=; b=I9b5lE7vfMY1zkFt2Yt7zzRFcZL3rigCmVMgZTiMcjvicuLIv3Z14INbfrDwlcFSeesjAh reiZqFwqx4skm5Rs9n+CqzT0bqWItsEQ/nt7beA/m4AaB56vuWMYrbrnSafa1FJ3IakktR R4DcF18tyd9flSNmuiotjFMBik8Ivr/+91agIyvcjBqvRgRgP5wCrHDqUgECMb4TwENQak 2gRUg53XNMsYWDda0Jj020JYkY1AwQk1MU9/Xu5k6zyFb9dLDqP9Yd2+3vwzz2E7Ir1c3g bDYYZghwKaGdKcBjQFjdiJbzFzgeXV4MaVdPVlc7Gu2P/uUOktQUoaJzGuBwEQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 13 May 2024 03:20:10 +0200 Message-ID: <20240513012011.1049366-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240513012011.1049366-1-michael@niedermayer.cc> References: <20240513012011.1049366-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/proresenc_anatoliy: Assert that AV_PROFILE_UNKNOWN is replaced 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1uriZkzI78vD If its not replaced we would have a negative index used in an array potentially Helps: CID1440385 Negative array index read Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/proresenc_anatoliy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 2fb96e9cf56..8709f400d04 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -857,7 +857,8 @@ static av_cold int prores_encode_init(AVCodecContext *avctx) avctx->profile = AV_PROFILE_PRORES_4444; av_log(avctx, AV_LOG_INFO, "encoding with ProRes 4444+ (ap4h) profile\n"); - } + } else + av_assert0(0); } else if (avctx->profile < AV_PROFILE_PRORES_PROXY || avctx->profile > AV_PROFILE_PRORES_XQ) { av_log( From patchwork Mon May 13 01:20:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48835 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp61458pzb; Sun, 12 May 2024 18:20:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWmC4x8kVBpS1xWyoHGXGWxcEZieJ2+rN+0gzz9nmQiqpBk+AKgfsJ4XGVpmiJzYIotnnZeF/UkfM8RQPZhdcOkd4TP1KBexyL6PQ== X-Google-Smtp-Source: AGHT+IFcO1f2b/+3sOrFo5QKuuZn4gr2l3BmhX86P8iIU1nFq5EVY0n4/DOMH12NLQT9kqHGxfwu X-Received: by 2002:a50:d7c2:0:b0:570:3b8:a990 with SMTP id 4fb4d7f45d1cf-5734d7038ddmr5351680a12.39.1715563255688; Sun, 12 May 2024 18:20:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715563255; cv=none; d=google.com; s=arc-20160816; b=lL3DpyRVxi1rT0RTArQOyh+S77E8l/8ZeUTgisnw1XIYvcL41xbyEDgvrHbZhkcDre P4mBLy/2KdvCpnLxk7At3QJnoGGmTn2ED9PlkgHqwGfMBXZb6FIqp0TCRw/XqrRNbeoi wnyrpI1bzDO+D0CGI+3/cvPa7ZaxowSjMbLXGEjZzEwvOjXGAtAH5dvKqXQxKYyOCjJA ZayLhwXn4z9CjPArjkFeVThjsbPJdCUg1fBgjR6/sPUcL1mB5Mie14aMB6Q867jxu7zf jf8fDEzqphzhKOlFgmdTgTEA4FDAPrysqsG9SuEj7sVZ7Lf0zW+0gTIHuVie/Yfl9BEY e4ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=h7GSgAR+VayWIWsZSCcwfiFk6awVxCF2DJumFEsbRtw=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=TibVGNBFaaPp7sbw/jcx618QXn1A4zB/4eEjeG+RbCSPhe38yZeTU5lQWVRJTrCjN4 f2NzsS3iViOVrHVpUo30IOZNRBIKcHlFVOb2aKA/VaGgNnAr383AlMN8OjZrd6vM2bxD 1OYj8IAnoe6pf8eaLGdGMO+C9vA0eJCLv5a2wLq0xmRhPRBdjwYQY3UJwjS2VgCUxLrW 6zpuc2Y+sxjtjY+anbOxdKmNeNSgwdvENYIRsDcrjzrbkWT5jjAnPQle2c51cRxXeK+S wr6vmrLRvrBRO3xm8/rvD2so5qnj7d1jAp6UHOGf1C0lOG8cByvPCLe7eKkWzp6Br2Fj +5Gw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=GC4yDpL+; 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 4fb4d7f45d1cf-5733c3627e0si4628944a12.489.2024.05.12.18.20.55; Sun, 12 May 2024 18:20:55 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=GC4yDpL+; 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 CFC7A68D6A4; Mon, 13 May 2024 04:20:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 882CA68D4AC for ; Mon, 13 May 2024 04:20:17 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E6A3660005 for ; Mon, 13 May 2024 01:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1715563217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KL2iEsmIxX7fgHDCR0UnO34gUZpzuj0z60gfeg/+of8=; b=GC4yDpL+mLcv/lf1i2mnYjwjN1Uiv9EUhXEYqbH8O+DIKjsfKyw5VHvNvdn6800Y5zzVSY Ipeo8P+0BnC4QLlEKKxo+H4XY1saROE1Hgot/Dc8r3a522Q3nURvlnclIQ1ezNv2fHqXGt d6icvtdAeAtm19xcdTnRXG2nH87EqwEe/+NwCUzvSGyUxSP65CUEeLDP0i+NNh+++rzmtk Fddh9y25wrGACk323E8bRsf5PhZwDlQOx6aKMC0mH7WWa1QpeT6JxNq39vaYHKnhUoIgGj sjAuFB2QU+KcA78nJYVvYoFZESUJtd/SIVrofrnWWKPP/XhOXawvv6mdxjO4mQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 13 May 2024 03:20:11 +0200 Message-ID: <20240513012011.1049366-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240513012011.1049366-1-michael@niedermayer.cc> References: <20240513012011.1049366-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/qsvdec: Check av_image_get_buffer_size() for failure 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ft+qSubIzy0Z Fixes: CID1477406 Improper use of negative value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/qsvdec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index ed0bfe4c8b8..a51ddace622 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -379,9 +379,12 @@ static int qsv_decode_init_context(AVCodecContext *avctx, QSVContext *q, mfxVide q->frame_info = param->mfx.FrameInfo; - if (!avctx->hw_frames_ctx) - q->pool = av_buffer_pool_init(av_image_get_buffer_size(avctx->pix_fmt, - FFALIGN(avctx->width, 128), FFALIGN(avctx->height, 64), 1), av_buffer_allocz); + if (!avctx->hw_frames_ctx) { + ret = av_image_get_buffer_size(avctx->pix_fmt, FFALIGN(avctx->width, 128), FFALIGN(avctx->height, 64), 1); + if (ret < 0) + return ret; + q->pool = av_buffer_pool_init(ret, av_buffer_allocz); + } return 0; }