From patchwork Thu Jan 20 22:14:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 33735 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6284875iog; Thu, 20 Jan 2022 14:14:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5XqzEpzI8mpUBCiD0RX8Myrelw6u6QBHG+r9Fb9Pk86iNumjmIvCD2mlxon3neSlkE3HE X-Received: by 2002:a17:907:724c:: with SMTP id ds12mr854511ejc.181.1642716870136; Thu, 20 Jan 2022 14:14:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642716870; cv=none; d=google.com; s=arc-20160816; b=xxv3/rCCSBMIGiT9OW4ppbn62zN85ZKdpCUZkyYk4ylUPiudZFSY37/FnSeQDLo/k5 Vs5Syu00uQS8dDZ3yDQF9ko/KApv7IAYa6/bweXrLHzJnOiDf2pw4lv+hjO3NCm6ft+H ReseG8dyZKNMVS+NTCg4+8ljwPefHKslTcNvGs/klM1Lmx5eaay1hJp/P5+PKPo1CcqN chBVeHlpQsgJJG7rk8QKSPxtSc8boXTEtFt8ps1MYysgY3UY8QOPWdZx6oBqAuozrV/X 9yS1QHMbxvr4s4Qzcan7Sfa0c9NtJU6i12HrOrj/D4jhhdrVjylcxqE96S0uP+hPnzKw c1YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:delivered-to; bh=FPybD+6rY1QsHS38PwWpjXYhXQAXsmdb2w5K220Q+P0=; b=Vio2eeyNvjwxINGIzA2ASe0qSkSnTPe35qgQx06PvCeSa0Gdo8Byvw8V6s5wJtovA8 pxjRFymU9EtyD6Fhz2JtpFE2cDjWtA/u5iCYCIKnqFZdYgGt5SRhdPZ3Grz+7RAInpNr hkAsnYn5aoDCpbphyLna90nloK7ECWEHjrQrexTKs9R5XN7gwlLWfCGj6ibwpYagIMTv N59mW3ehuOPjAhKPJ35vad9Y1nNPrf8XWAJvp8BQ2761h7ZexTTrX1YWGSQHR7VYbH34 I3jCgyzs3cr/Mu1Bbpjcv/Horb9ki1rcvrg7quFGt8yGSzIc9/rm5KHsd3h1FvppqAAT hi6g== ARC-Authentication-Results: i=1; mx.google.com; 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 gj11si2968910ejb.836.2022.01.20.14.14.29; Thu, 20 Jan 2022 14:14:30 -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; 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 3B97968B22D; Fri, 21 Jan 2022 00:14:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75AA168B0B7 for ; Fri, 21 Jan 2022 00:14:20 +0200 (EET) Received: from f0b13fde3b442eed7d21db83966c973e ([1.152.190.132]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id 20KME9MZ021925 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Thu, 20 Jan 2022 22:14:13 GMT Date: Fri, 21 Jan 2022 09:14:05 +1100 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/img2dec: fix logic error in GEM Raster file probe 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: tJG0ATuMTUcS Use correct logic to express limits of the planes and pattern_size fields. Fix ticket# 9605 Signed-off-by: Peter Ross --- libavformat/img2dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 4d5ac51b53..2583ca2465 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -1115,8 +1115,8 @@ static int gem_probe(const AVProbeData *p) int ret = 0; if ( AV_RB16(b ) >= 1 && AV_RB16(b ) <= 3 && AV_RB16(b + 2) >= 8 && AV_RB16(b + 2) <= 779 && - (AV_RB16(b + 4) > 0 || AV_RB16(b + 4) <= 8) && - (AV_RB16(b + 6) > 0 || AV_RB16(b + 6) <= 8) && + (AV_RB16(b + 4) > 0 && AV_RB16(b + 4) <= 32) && /* planes */ + (AV_RB16(b + 6) > 0 && AV_RB16(b + 6) <= 8) && /* pattern_size */ AV_RB16(b + 8) && AV_RB16(b + 10) && AV_RB16(b + 12) &&