From patchwork Fri Jul 5 00:21:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50348 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4000357vqv; Thu, 4 Jul 2024 17:22:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU4rj6FFgqT3jJspFSb1GGSzNja6CAU2BMFMyqOtJsoOEMu35gHQ2oN2dTqrs9Ib/nzTEz48M+4Fc8O/CNhfoXjRHN6JWskGvMZ5A== X-Google-Smtp-Source: AGHT+IHWBeZO8xXAXmI3HkRAnwgTDZPfEddTBBdJFp4DYwhHYsdzEOCb+CeANq7zkegddhpLDH6N X-Received: by 2002:a17:906:4685:b0:a6f:20e0:1d1a with SMTP id a640c23a62f3a-a77bdadffb9mr244235166b.33.1720138975938; Thu, 04 Jul 2024 17:22:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720138975; cv=none; d=google.com; s=arc-20160816; b=CcYGq+lRvSm+LvE2Rbeggxu02wTqxYWp0vutTAce5FerA66Ud/+5xk/AHER0W3FFQZ oTcrbfi9VhqmfigA0j3jESN3uVMwXQwv30F/8bV9ihBdnaW9A9CbunoXHF3idTQ5aDRH DV/Bu2dcPh1QgBC2bKcV4Ohx5JRUK6Wo1fhVcKMoOQQZm4hyx8Kbjq85bTOURLBW5Oyk 0P7X9TtTLl0fmpRkOkMoB0AfZWV2w1GIv0WYAS7/XlC1jPmprb/5s9vaP5jd61hz5lC+ RcXQ4xDVvUYYs01PLXfAQBXxxlNjlyaLSaTG0Abw064tJ3HBf3zmX+wSuufFq71Aq9OP l+4g== 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=A0o2aUkzu0fCaiztL+T34Ovmep1j2Qe6xcqmuD4dhyc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=qH7dQyc2qCCXyl+4iiA0r/Ac9blhqkvMj6QrROnh9hDZQQ6ONruwC0NZn16a7ZsS9W WJn07QeJeTCZSr8fczqieCsJhpxvjHYOauAjCIYaQ8WPK1IbnT3Hrn24zLy5S3BE8TAV LFUl7WzCZuGy6liCCj165dgKknHF7KCFGBPjKR/FW7LFRtnb91dpDJg7aCNZlWHXkbhA +9RBdFW9uLBRgZoXoxwIXHpvCUNmSVICDjzX9Rbg+98OFXvLbSWWCAIbk3XH1kpmXMSN SJ1ySqeYw50bYkx++broBppR4Z92XMOrLsEacx48ZukojDPUFyhT6YsRDOj7QBrZUZS7 IZyQ==; 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=n0EK0qRh; 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-a77ccee526csi11774066b.576.2024.07.04.17.22.55; Thu, 04 Jul 2024 17:22: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=n0EK0qRh; 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 3AA1068DAFA; Fri, 5 Jul 2024 03:22:19 +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 B96F868DAD0 for ; Fri, 5 Jul 2024 03:22:06 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B0DB61BF203 for ; Fri, 5 Jul 2024 00:22:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720138925; 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=ECFDe30C8eVCWEPcS4mSGgnFGCuE4UUyT3wS6DRRcYs=; b=n0EK0qRh8TeRj3uiWNHoaqyFpFq1QOwK6W6W7qVjxU1dW8BveSFHA5oNFMrb4DhcDKRAPc axTQG3DJ7gubQ2+trDl1bb3F/a/5eV3Riy/cYeDkR22MdgYAgcyHubmMy1FEqthiTqrP7X 4y0juc6f0j3SuP//SLfXlNEwEupFR6v1pfbxxw2IfUxp8xaaV2qN1IrKs+00maPb+omLjg W5k9ne2lq+8JOB0hcZYwo0HKV5vdcB5B+V62AKRtg/UFeckNtABHgrK3wvndioarGy9vMV 0Nt56YRMzyUMInRQUKHqvanx+0JZ6rXopPV+YXwAg56Y/kttJc9GZ5vV/Gu8+A== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Jul 2024 02:21:52 +0200 Message-ID: <20240705002156.1964272-11-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240705002156.1964272-1-michael@niedermayer.cc> References: <20240705002156.1964272-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 11/15] avcodec/loco: Check loco_get_rice() 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: PHUGt0gtlN3M Fixes: CID1604495 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/loco.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/loco.c b/libavcodec/loco.c index 4aba1eb9c52..d73d8fa88bb 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -157,6 +157,8 @@ static int loco_decode_plane(LOCOContext *l, uint8_t *data, int width, int heigh /* restore top left pixel */ val = loco_get_rice(&rc); + if (val == INT_MIN) + return AVERROR_INVALIDDATA; data[0] = 128 + val; /* restore top line */ for (i = 1; i < width; i++) {