From patchwork Fri Jul 5 00:21:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50345 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4000136vqv; Thu, 4 Jul 2024 17:22:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW2GdtpIMlDRmGaZqUQHMiMdX3ehFDlRFwhUnsmsC/ByEGoiK6KcI2ohPxiAxVwveivghxqwgnRXihMb8gtTLsCckQHD9brGvh15w== X-Google-Smtp-Source: AGHT+IHGLuCo4bw7rVI6JRiZ7JzaP3+q2MUSulRsx7sx2NDq743SOBllt2KH5dgJskxmbc/bG1q9 X-Received: by 2002:a2e:7e07:0:b0:2ee:4cd8:94b6 with SMTP id 38308e7fff4ca-2ee8ed90e17mr23876041fa.15.1720138939058; Thu, 04 Jul 2024 17:22:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720138939; cv=none; d=google.com; s=arc-20160816; b=tSLTRY76jWAPA6wLdIwlNtVWrWdJ+74yR0a4Mus8BDcZbpw25wTa/IlUBTYvfCiVlR Zu7kxojTO9a+WlP0vwnNEEaUclR9PlaF+vf8V5lmGeEGnwBut/CWA0tYjaIKCj7iEWEW O3GxvR+6wgB4eXKarvEYPdRBsRYJ0Z7yq1FSZ07iuCrsxAEj6Wj29B3kgP3z5Dlkhe66 zKvtJ/exg5hYHbuSnbTztaYJwcdIAg5rqlQX3t/m4W/19kpRS8aWrL3MI09VZA+H6FsS T3m6digkHFuxaNvbxgbgvA2HwO/N3E55XOFuPX0btbjkiCzZT1CzrF0ifIbYtXfxEuMC BVZg== 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=38R18HIX4bgpihM+wenDM8YN3L9qtP35mIKykScxuck=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=FnQelgkog145BDcxLSjGrD7aZ2V8e2J5W6sK1fUggLw2Dj40awMTy1lAawv6W3fhDo WygzDOba+OMVUydeTOtVrRMdaa5QiZ/1d72uEl6ArA8d2ROQQUkmRqcJwZIQ6zSiIxpX 4folO+TQWwXVoNVzFgElGqBqKwc47K00hxmccpjhcEvfyIyIS+hQVW3d+OWnLrC+xrwl jcYyv98E1b3T285olwNjSkd90Pw1LhBvywrvojcW8ujkLxXjOozf4YNSVBBX0aEWed6S XimMn6m+KDd3uWD3LxaMHq5iRder48VP4VuqggjaWDomHS9FlzO61DBa6WGIym//7XiQ aBuw==; 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=XFLtcZmm; 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-a72ab04a256si712113366b.308.2024.07.04.17.22.18; Thu, 04 Jul 2024 17:22: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=@niedermayer.cc header.s=gm1 header.b=XFLtcZmm; 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 ED42F68DADD; Fri, 5 Jul 2024 03:22:11 +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 B440568D9AB for ; Fri, 5 Jul 2024 03:21:58 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id EEFB660003 for ; Fri, 5 Jul 2024 00:21:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720138918; 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=6LFf/YW9VLpk/ezXGnNq/Qbxda721ynxRMb5A0H4mLg=; b=XFLtcZmmSSj4vbTIvwmlPsxmpd633buYL6pzol2cXy3GGpDZq+o9z82Wlt1uxXOt6PRcU9 b0xKOVzSljMp2AxlsDlDI3Tc+7FrAwBUYTw8kL07IZWCr2TRFY1+qjnLs4F6dNJLBQQ7eb 6zHtH9GOfhVI5hYcsB66Drpw2wC5UfXha9FA29zLMWSHlI9nUPV74t+wx4IgkIXaCYkVEB ZDGqeFFGgxzZEb/588ja3aAcBMarrYs/JOcDpFuxykNntY3x5zXAwBk/XfQI9Kk1MXf0yF 3s67FNZk3pI0VO5utWDgnjSmzowJCetV9uv9z0b31PLNT5XdQdDRBlNQRk253Q== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Jul 2024 02:21:43 +0200 Message-ID: <20240705002156.1964272-2-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 02/15] avcodec/cri: Check length 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: vKKx4BhrOeey Fixes: CID1604394 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/cri.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/cri.c b/libavcodec/cri.c index 7b9a350967a..6932bb67456 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -234,10 +234,14 @@ static int cri_decode_frame(AVCodecContext *avctx, AVFrame *p, s->data_size = length; goto skip; case 105: + if (length <= 0) + return AVERROR_INVALIDDATA; hflip = bytestream2_get_byte(gb) != 0; length--; goto skip; case 106: + if (length <= 0) + return AVERROR_INVALIDDATA; vflip = bytestream2_get_byte(gb) != 0; length--; goto skip;