From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6A26E47694 for ; Sat, 17 Feb 2024 17:10:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72C0F68D2D9; Sat, 17 Feb 2024 19:09:58 +0200 (EET) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 42C7468D1F2 for ; Sat, 17 Feb 2024 19:09:50 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 66C94E0008 for ; Sat, 17 Feb 2024 17:09:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1708189789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=TYe81kbR/4PmAmxfHQyKkEXC3ZiaSjIjoSpTOgfxYBY=; b=MLtjEUtX+WBNM6Cw657tzd77CRiDgSZaef6BumeG8MaiwwNsJTPhnc0HUpXCltsoQybjqe zqgKUgrshrbG7WeqTMM607WnUzOC/xxUmiaDM5DC0H9FD/vf4Ufsutaqb8az+lFRwF+cBa VNES3UrKgrQ52BoWmXj6/igX0qIhA4t74m/tMxP4FlijsVYnTUUVN1P82hlt9FNggzv2I+ mFgjbJ6ikwAvxigHBvVkOglhF0IveAvNwMnmoPuEqwBPX7Nlr+Br3C54sShL1jmotvI5Uh LhiJVwFpMAtdrUXExGd24XJXRuW+kdZcJpmqdygUMOui+5oxzpCGECBvzioQuw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Feb 2024 18:09:47 +0100 Message-Id: <20240217170947.25351-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240217170947.25351-1-michael@niedermayer.cc> References: <20240217170947.25351-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/2] swscale/swscale: Check srcSliceH for bayer 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 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes: Assertion srcSliceH > 1 failed at libswscale/swscale_unscaled.c:1359 Signed-off-by: Michael Niedermayer --- libswscale/swscale.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 46ba68fe6a6..7bea5147db1 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -904,7 +904,8 @@ static int scale_internal(SwsContext *c, if ((srcSliceY & (macro_height_src - 1)) || ((srcSliceH & (macro_height_src - 1)) && srcSliceY + srcSliceH != c->srcH) || - srcSliceY + srcSliceH > c->srcH) { + srcSliceY + srcSliceH > c->srcH || + (isBayer(c->srcFormat) && srcSliceH <= 1)) { av_log(c, AV_LOG_ERROR, "Slice parameters %d, %d are invalid\n", srcSliceY, srcSliceH); return AVERROR(EINVAL); } -- 2.17.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".