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 477D24AAE8 for ; Fri, 12 Jul 2024 19:03:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 43FBF68D925; Fri, 12 Jul 2024 22:03:27 +0300 (EEST) Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1820368D830 for ; Fri, 12 Jul 2024 22:03:21 +0300 (EEST) Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-3d5657327c1so126232b6e.1 for ; Fri, 12 Jul 2024 12:03:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720810999; x=1721415799; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=XwFUeeBL0pQ8vSr6cP3yoFLKJlSd5qXQQuVp7DZ+jdE=; b=T1D8X6rYhsssi0m63qhrFLXeYoFyByVXpsnBn7mxnOUGQZObnUDV1cIWm7tOBb7XAk j/5nqcfBo2t/Tryf/aif7kOun6299iP/aEqec0vpLmaS+YRdWEpRUDQp73aZOaa9jQ0x 9HAa0LAo+pwqMPuqy+SkS4BnbqeZtOiC+iVq+amtbwWbD6+rRon3zwY7mcLZuu/QP4Hy 48rVcfirIPuIsxtBvHZK+kO2B79Ieqmi4W57Ey2pqpikhJlDbNC2VyWlpYPYAo9owPEm E9VziE4qrigVdY/u2lVJh1sANMQjeca27q6PzqXIyCnR1X/vLDkYnrp+BUKBUDp605RH Vxhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720810999; x=1721415799; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XwFUeeBL0pQ8vSr6cP3yoFLKJlSd5qXQQuVp7DZ+jdE=; b=bxP2mu0cb8jwCsEI7e8qoa/hUWvjDYcP/93eTNSetlQ8kgW6taVdeoFf243kcO6Rie KIePIuTi01+w539Uf/JmT30qQ1m4eGdGWW0tdwqy3VVcn/hbRv87eYY/VUi+2HnGpKhw XRK/zsOSeTpRcye9RF/c7l1+GEWX1MiQAz00ko9Fr1kySoCyzPDAcrH/ld8qe9RwAgVp MBw3ril36neJNrWG5urImctDMwCu30sPzNj2m0I0GYyp9KEgO+irABiU43XbWvDLwEtJ bb2yUb2PGcd5DUFyinjvacopwu+p1VlUpBuKhO55/IFBc/HHJivwPt8SYolbVll53P/i XN+Q== X-Gm-Message-State: AOJu0YynbHu77FovmIA79mri90hO79I23YL9T+6ilsQ5qWRrt3aCUtnj BAvG+g9S57oIgcxZHywIxva1Jv0nuM87ZZNGGm8StVYI2ESY9TPdfN5kAw== X-Google-Smtp-Source: AGHT+IHf7k1xfAhhxNpokInEKr1bXujpIdiSCe4G+UZ5RM/Dvmk8otQbMukB7nx1EcgMZD6ocejcXg== X-Received: by 2002:a05:6830:63c1:b0:708:b80d:f3f with SMTP id 46e09a7af769-708b80d1cb2mr1744841a34.4.1720810999254; Fri, 12 Jul 2024 12:03:19 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-447f9bd266fsm43447141cf.77.2024.07.12.12.03.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 12:03:18 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Jul 2024 15:03:16 -0400 Message-ID: <20240712190317.294917-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/pngdec: avoid erroring with sBIT on indexed-color images 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 Cc: Ramiro Polla , Leo Izen 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: Indexed color images use three colors for sBIT, but the function ff_png_get_nb_channels returns 1 in this case. We should avoid erroring out on valid files in this scenario. Signed-off-by: Leo Izen Reported-by: Ramiro Polla --- libavcodec/pngdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 180806e5e1..b0d02c97dd 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1084,7 +1084,7 @@ static int decode_sbit_chunk(AVCodecContext *avctx, PNGDecContext *s, return AVERROR_INVALIDDATA; } - channels = ff_png_get_nb_channels(s->color_type); + channels = s->color_type & PNG_COLOR_MASK_PALETTE ? 3 : ff_png_get_nb_channels(s->color_type); if (bytestream2_get_bytes_left(gb) != channels) return AVERROR_INVALIDDATA; -- 2.45.2 _______________________________________________ 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".