From patchwork Fri Jul 5 00:21:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50358 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4017125vqv; Thu, 4 Jul 2024 18:19:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVd8BGBYeD4fFvLsxYkgyGqOZaiPTnLZ+FsXW31l+V8o3AH0sa79k4vyJcN/f8afw8Eejb76Z/Crj3aFtADcjZbhB1FhLkfzGskRA== X-Google-Smtp-Source: AGHT+IHl26Ll94Rls2eZWS+WmZ3TKbx5DFuc3Di3YzPWjCnZ8iUIxbCTiFP6deiQa3DuKBylhx5q X-Received: by 2002:a05:6402:2803:b0:58e:450b:da08 with SMTP id 4fb4d7f45d1cf-58e5b4aefdfmr2422656a12.31.1720142348362; Thu, 04 Jul 2024 18:19:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720142348; cv=none; d=google.com; s=arc-20160816; b=yhOKYJmmicyXloSOmu4DalBUmPLvoTFzYyW4aIRwYCLNV7dDW3RD6W8PPS0qKpF3PV JJZao2AjMJbQarGtgTxy0o0MeFqjU4PDHgoY674fUuMTJnidDLpP+LwmPIYCKcp7fuaV QEg57e9RKeNLfHFPSKLZ2uKbTJ55ENAEg7JVolPtyCEWdVyRQOc3Np7sd9h/45fMJ+JU u8gOtkSvZ8aEdCQ0X+KBSJ6bmfAY6F8kDB5KggozKR69xwy1frtzDTyOaFqIcuSUbLJL w7aF0AQzS01OSp2M71I0B+SHs8mFG4Tz27x0zuuD3ZeipJsE8Q8exb1iLwCaBWhV1Qqs rPLA== 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=ft48663jeem9IDrUG/xRlC77fzNMHg5DsDG4TAaA1LU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=gjvwZ60FqVam8fPMHqwc9Wq/mGp4j5yPBD1qmMl5SHuxnsPgwEgWXJXcQTveRHOKE4 FYd2iCgoExnViv9RJAVUpL6kbs9jBrMoKpihWg7GZlxVCuAnd9bkFtl0i5MLJY2C4vTv xWHqP0Xu6FXwdGdAVFu6CgaWECCOGuT3OlDdj4g6zBDFZrWsT5BsTnQfx4iSTiCJz6Hx irWu35YWBLqHt6uTX9MxQINNeEXjxwIFB2PZ2DphxCu0F4KlzwVDvEPrDwGNQsko1KkC crDgIl+oysyHwLbEbwCP6RET/5xtKEAB34X1w8UPM3n538MQye6DmtfzFr9C6I9OX1sC raYQ==; 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=lyD3YAiC; 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-58d81acec1esi1951756a12.259.2024.07.04.18.19.07; Thu, 04 Jul 2024 18:19:08 -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=lyD3YAiC; 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 E168568DB2C; Fri, 5 Jul 2024 03:22:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CF8F68DADD for ; Fri, 5 Jul 2024 03:22:05 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id CBB1D1C0004 for ; Fri, 5 Jul 2024 00:22:04 +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=3kf+HhtBJh1w4b0jHnY1D4/KEBJUfl+B/c8gSDUAxp4=; b=lyD3YAiCOX0vQ2dQURWBz/y/TakWCRTa0pRvHQkuKU3QILiDk2YEvXncKVOzyC0OjPxS1K P5jKxfcMTGJeXTpP3hOHNB3RfkYoz4eeQv7YY/e/Gc+uZCiAjiIUgBR/EXR/ATlq6TDeQ7 jUBGuaYwukWIJpJy5lA46PL6486XpCgxbgz6JnASBQokN/Kg5IP0eH7jcr7e1D7pTU6isF tAb74NoVZ6X4Y2lLunCzDduxhTdXq1ESuTuJsHUhuZJOo9yZPaIMYdb4pZRWLDgVjer8XE Bxk8f8UgfpPu2yKju9PEdUONt45gdW/YZjxtFoQYnJn9Fx0TNXyqDlgh+Xamnw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Jul 2024 02:21:51 +0200 Message-ID: <20240705002156.1964272-10-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 10/15] avcodec/loco: check get_ur_golomb_jpegls() 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: aqkzghGINtX8 Fixes: CID1604400 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/loco.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/loco.c b/libavcodec/loco.c index b1294a97980..4aba1eb9c52 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -92,10 +92,15 @@ static inline int loco_get_rice(RICEContext *r) if (get_bits_left(&r->gb) < 1) return INT_MIN; v = get_ur_golomb_jpegls(&r->gb, loco_get_rice_param(r), INT_MAX, 0); + if (v == -1) + return INT_MIN; loco_update_rice_param(r, (v + 1) >> 1); if (!v) { if (r->save >= 0) { - r->run = get_ur_golomb_jpegls(&r->gb, 2, INT_MAX, 0); + int run = get_ur_golomb_jpegls(&r->gb, 2, INT_MAX, 0); + if (run == -1) + return INT_MIN; + r->run = run; if (r->run > 1) r->save += r->run + 1; else