From patchwork Fri Dec 24 03:09:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 32888 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7805762iog; Thu, 23 Dec 2021 19:11:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5YrkpbW5vhGeLwvLCVwsyRahpea1AGojtOsfK/7yw7zj03X6fpc7nXT9GsM6Eo1JxLNp4 X-Received: by 2002:a17:906:5284:: with SMTP id c4mr3902615ejm.423.1640315505717; Thu, 23 Dec 2021 19:11:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640315505; cv=none; d=google.com; s=arc-20160816; b=xQKTA+P2KESUVfuUwINgMOSUA+ncnOwnKqrD3rDS3LLM5qwTUdFadIWPc1OtfnLvqV IimeW78TuB3WyPP93KQ1T9YiOtV4WZRjI+XV+iu24+qwFDGSH6T/93SBM/GuZ3JLNXd4 YdaCjNF5l4ZM7ZtL9KoifNLUtdHbn81+Wr/08y6bZuLFQYmLbnob3m3diHKn+0503GeZ VUhkp6lV1XGWBOremI10n3oCcrGt2hpF2ThKmAtQa2IyUz7QOhcGQ1plR5BvZIKBQT+w 6iFjg65KJ3GdgkIG+DpoFyDiM51HP3I7ZVNwuAXX61hpLvkdmSvN0okAeqCxli+VcWNR rurg== 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=yRX+kxuafvU6Q71foy6qXCh3S0ASSfOpweH4JBucE9A=; b=StTM7cKbh07Yc0eMWRvZ/01yjy9MvE9eWUzfCNgIkZBxntv0NfY+8czKSSFaf6dlBF jb5/QUZJtBIIsd0/bstF1GwHKXsn01yvP1Gp0XpzqsQjg8Ow/rUSWza4Isf2gdeA8Zjh WM/v+0Xp7RPYKM4dIenz3oelMLWkRsFSCT1ElUatpxY8ndMVB+yuB9bzxjDW+fHYIwkT jn9Nk5MxC0k5QAZQhxrL5TpxvZM4brIxpM5yum83+BHFjlLIRpvq5mRlZGsMXC2g2W5Z lxUBLJtVAw9hEkSWxuxrTw7JctyTtMd9J0/T8u3derrOipxZXK0imlMQZSeV/R+0IPCu w9Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=T8lzqzwY; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b13si3763757edz.295.2021.12.23.19.11.45; Thu, 23 Dec 2021 19:11:45 -0800 (PST) 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=@rcombs.me header.s=google header.b=T8lzqzwY; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4E2E68B24D; Fri, 24 Dec 2021 05:09:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 821B568B213 for ; Fri, 24 Dec 2021 05:09:28 +0200 (EET) Received: by mail-qk1-f175.google.com with SMTP id m186so7270676qkb.4 for ; Thu, 23 Dec 2021 19:09:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nKgDLeK8s71IASdzfv0YikPbVbpzJGejUAnrF4fYtzU=; b=T8lzqzwYo2A9vGmU7zW4m1niqrbMTPqFVHQNkt0rRKpi/nzHlD83jmSLeYaM5mIct8 n3tU4c4YqGtmpuS/tVoh2TedaEKUqvnEiModa9r1FJDAkJN3BTLoPQMzWtup0vkl8qny 6ARksjb+pMHhJoKRY+/qFrNwy7pBH0dgOY6LVtAuQCYuGjPw9KxVP4j+lT6DOqAHec62 oe9OWA2hDTyaWPFZn2hgtokChxHULKftQUHgIqtrSeqQO7hPygAOcvGXPzLk/lA0sBIl HgUuKvE2fxoPPMZFajHVV8wTn9N8bLWNiSTjJyhUeNvgcd+Pb9f7QUBLmmuPnJYh7TZB vEhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nKgDLeK8s71IASdzfv0YikPbVbpzJGejUAnrF4fYtzU=; b=CKof5785akRfmn6PezVh9Yjs5VbK01rmXTnzZ4alGnbARw2+bxxAoFF0VSFFE5Myr0 2CkIm7LEFVgMRKaGtWHOXo40XLk5nKAzfiJ4Fb8G6WbdJDPAGwyxcs15GUbnomE7ppF3 KxB5e43/iugSMevyB17sYI6ZQ2erNC+AFEV7YsJXxss3kBcGMSzuIYO20nYVps2Kppcu B2UUSyrfkUNvLjg6JVoW8JXWuObDHznxIZ118rz9MfxlNG33mrMP4uWGqAkRlxwIosk1 XGpAAz+Jdeenip7HnXTdyB3CvQ5la9JuCvyvBkqWDvkv+iLJ7OgYpWv9CXMeylu27Qwl yodg== X-Gm-Message-State: AOAM530AJu3UWXjV8zXIy2ooSXEnLEUtL/iP9LSque5XTB6LAhvZgdlW TxBUjH9ZhsnzBzbf0tUjpKyRLUmwLrzssGg= X-Received: by 2002:a37:9b16:: with SMTP id d22mr3523651qke.696.1640315367034; Thu, 23 Dec 2021 19:09:27 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:cd8d:58a:de7b:88f1]) by smtp.gmail.com with ESMTPSA id e15sm5162479qtq.83.2021.12.23.19.09.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Dec 2021 19:09:26 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 21:09:02 -0600 Message-Id: <20211224030904.1196-15-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211224030904.1196-1-rcombs@rcombs.me> References: <20211224030904.1196-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/16] lavfi/drawutils: ensure we don't support formats with non-pixel-sized offsets 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: cXFJt5w9hxvb --- libavfilter/drawutils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index bcdb669bd3..5308fcbc0f 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -114,6 +114,8 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) depthb = db; if (db * (c->offset + 1) > 16) return AVERROR(ENOSYS); + if (c->offset % db) + return AVERROR(ENOSYS); /* strange interleaving */ if (pixelstep[c->plane] != 0 && pixelstep[c->plane] != c->step)