From patchwork Sat Sep 30 10:36:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 44048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp311082pzf; Sat, 30 Sep 2023 03:36:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHq5n6H8EqPQ/F42TfbhjKxr9XAI+X62YXO7Jng6Zk+Xnf1HLeGdC7DPfKDU9PYgFIA+6Z6 X-Received: by 2002:aa7:c453:0:b0:533:4fad:2e5f with SMTP id n19-20020aa7c453000000b005334fad2e5fmr5783040edr.12.1696070179051; Sat, 30 Sep 2023 03:36:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696070179; cv=none; d=google.com; s=arc-20160816; b=w6Q7Bs942SZtTz0e1sXBcXbr56plLmHqDxfvogVdFDDA9wGyL23WJTjEagNFnc3Lud gsuOAPFkKcjln8CNmOw029ewiPywBRnxzSvAC7O1XClEqfZXlKKShitJMx83zDxwWvcg a8Fkl3ntKjlYt87jnfDvXyzoWjzHqzW5HDjXBO3IdCPzgwYdx35jTBeEuFXYDd1+xZFX 380xRElOI3z5j/5XNIKNztyPKMK8ND0UX1r6vxkbcYqti73GNtfxawP5GjkuJipIZkWs aqJ5NRxywzfIVobK2Mdb9qIIEx6Ecv9I+PlkblgSUIDXEZmrmZ8ItDl0PPDh/4s3hKjz D8IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=qaLoyxk95y6ASeFs8bUSJ4r4I+FwN6IES4IYEvZyyaM=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=NPDsm3kyeCstnAFkS4Dw1O/HBhMCAYH3NGd7zieKsWCY9+UWHViKsDY1heo2+v08+3 oShbMqazCGTitGZOOhBbgVcLm4cZS+vqmpAMdWQmUzFYIgq1F1ekKUG16FDxB9PbWft5 Iw6hwosxNe3J3qvqbOaVUEFbYnVq1OP+MiZSCO6FMx6qvMH07akzAUbMBMcBomo/fvQF 8NX3gfIeZsoZsi7mWK4hKnUNbthXNYiKdtCiKseNo8ITNSVFelMKRiSa/yN4htfpRMG3 ytu/xGCjP6WyX2wpMe21O9LydX8NY5gRPfPmof8PRT94xdbUf/4DmZu4LPRqi3UGRDVc ybXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="mGt/PhlM"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x19-20020aa7d393000000b00534878c3218si5242662edq.94.2023.09.30.03.36.18; Sat, 30 Sep 2023 03:36:19 -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=@gmail.com header.s=20230601 header.b="mGt/PhlM"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B88B68CD07; Sat, 30 Sep 2023 13:36:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f195.google.com (mail-vk1-f195.google.com [209.85.221.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C62B68A336 for ; Sat, 30 Sep 2023 13:36:09 +0300 (EEST) Received: by mail-vk1-f195.google.com with SMTP id 71dfb90a1353d-4908d8f7263so6077630e0c.2 for ; Sat, 30 Sep 2023 03:36:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696070168; x=1696674968; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=+HJlJWC9WbF/wbYkogwSdWd8b7lAQck4AqFUeS5IeC0=; b=mGt/PhlMA/mKsnt7bQzcl/8VVwmMBEniUNGAoI5e3oHgsX42BMI3FErQQxKcdgyhM+ MxqZOXJvCsH2JhnQgygzLYikMtvBw7M7+VquaIlSU5advk+W8FoouRxD3p9Ad3BIOCWf IAaLHWQs8jhL5OcUfuClHEr3Xjjes3bunqX239gBWutNavRgena8pJ9ocSUKfjqDeM5M D9ckmgc8lMTRux+4UDpzF2D8tng3aFX7IfezvOKKgvfHt+arlIYA+6E4tYKJKa/YSzeC bj/WxwMnZ2ATjHSYe2IeEQg1sC/jKSIiUabP4jE4F89OIm5ga9wG8RVVc7wKI8ZWQO1g kwiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696070168; x=1696674968; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+HJlJWC9WbF/wbYkogwSdWd8b7lAQck4AqFUeS5IeC0=; b=SDjuG8yg6lr+SAt5LEJZ+YAN44/cym16n8TY1FiF0tTs6NNAwEtVUABczLMDadXLMt y7t++isQBsvEJEkk1n4JDgCV6ua99pAOJzH14i9sZhWgORhJvziXG3HABlupLz7FZ600 kkfGdnOz44liQ5L0iHNw4bKJhJuhzgrjKIAcIbQlETRRqsrIKOC9chesjVYfzBffW5J7 U0/kVmBwhIJ3JEvNW1nhiZ1o6SqEy48SsbXfeHuHogGF//7GpMkjUVrSEVIqUatSQnSz KqT9Gkul2W0c6KleCOBOv4+FLqm6BLbeytkfO6R3Os7QJ61EDnmj45uW+nA4NW/elQpH 46Rg== X-Gm-Message-State: AOJu0YwNrlsEIbrlmocsZ3bzDDtPs/3Gk6XAhb9D+N0XVWlDVNGSSuGp PsW3IpiXiaiOQ8maKNWpiszi6B+cLUzm5VAyV0lpADfPnpLKUJ02aYQ= X-Received: by 2002:a05:6122:421a:b0:49d:120c:3c2b with SMTP id cm26-20020a056122421a00b0049d120c3c2bmr3649600vkb.8.1696070167697; Sat, 30 Sep 2023 03:36:07 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a59:b34a:0:b0:405:b46f:a850 with HTTP; Sat, 30 Sep 2023 03:36:06 -0700 (PDT) From: Paul B Mahol Date: Sat, 30 Sep 2023 12:36:06 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/lcldec: fix uncompressed buffer size calculation 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: 7W0GuTj0EZ+z Attached. From efa34f7cd140f4e696641ce730b8e2b97e3d8452 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 30 Sep 2023 12:33:58 +0200 Subject: [PATCH] avcodec/lcldec: fix uncompressed buffer size calculation The width is truncated to multiple of 2. Signed-off-by: Paul B Mahol --- libavcodec/lcldec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 11e28683ba..3168f9697f 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -248,7 +248,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, bppx2 = 0; // will error out below break; } - if (len < ((width * height * bppx2) >> 1)) + if (len < (((width & 0xFFFFFFFC) * height * bppx2) >> 1)) return AVERROR_INVALIDDATA; break; } -- 2.42.0