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 ESMTPS id 377954BE7A for ; Tue, 4 Feb 2025 03:22:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 165F868B407; Tue, 4 Feb 2025 05:22:36 +0200 (EET) Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D40468AF86 for ; Tue, 4 Feb 2025 05:22:29 +0200 (EET) Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-6dcdd9a3e54so48105876d6.3 for ; Mon, 03 Feb 2025 19:22:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738639348; x=1739244148; 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=NR84x1aKtsYRiAEAjrdF03Ra2TlY/1RYWrbplBvtE7k=; b=HnSROMdxA+ObLePMUdg/I3URgCL+fYBRE/eHw1K9ZiK3ga3yFkcepe1SkaVk22/Cgz JYbU03nkDXd3GQet96+EtUCiJzLmmufKRxNOUwdR2i8GGAjRAG6Gp8hcZVIGOwiQ1Ng4 W4su5Eak4F7v72FEukjs7xp61zoBC2V6Dm5p+p25RM0GvgtZzlvShhBc2dUd3emWoXuR u9z9mxtrJl38UoDHq94rHQjuzrzATP0TCi4UlxqqJlCqvuYHv+eqUjdL1JgzLhnY1hiW soz4zqyIo6zERmjJpfJHCcF1cp5FVXCHeLI1DWlJMNzPb+3F+Ta34umGlcszKAXD+uuK 5x2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738639348; x=1739244148; 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=NR84x1aKtsYRiAEAjrdF03Ra2TlY/1RYWrbplBvtE7k=; b=xRbWyFEzYzT3nQm0SmtuAZyt+XO3oooJVmJgi6Bhcz0j4al17waxakfqEhdz3x+WPi j5WkPnn/oEX/sbJIhou5x6MHoFyo1eUWHuBP4sPqW9DWj0Cfr1W30JQDMDU0uTiUVJe3 JoFMbVV1I03igwmIY520+3KpiNm/8SGijbys3vvOIvSLS3ncFOb7pTgDr5TjarVfr+VH TAkwIex9t24qgvoQ3dIB1OVVTwsrxx5IVYZrskXhFeoIuucmKmvNt2VWBfMfedrtG35H R3YSTPvTyKvHrxP3dOVqHqppATChfXjB+iJroSCNj32fuGGfDirqcXwjB6qUXWLyAWZM 4CqA== X-Gm-Message-State: AOJu0YxzxRgkjL/ZBEZ+MB5p/jMYLNQYMGpN+JbbONv+nokKG1XHge5v t6A8O/dA/JTqLr939xgtLzYgF3tZ1yfYxXenyJT+1vDrE7KC3+y6ipVXg/Df X-Gm-Gg: ASbGncvTPfqRN53TAGUSc/DDftbOaLfBd9WopydrsFPo0WpdBp9zV22vZkMSc9wRB4i l+DEpQw6f24dzKEDv/Rc7xaNDEHiFIxMobxI30p+7M7GWWy1G4IzaulQTRUM4M+QPNt/DUeVeBN rMKayN1Sv5fK26eeIU9XuFBVYNL6AMKy/AOZs6sFcnEq5zyxs/Qgpo6KMGRvjFiWw8wCFnCNQm+ WpxB6EhnqOrr9laji9wSLja8WF5j9t38LxogIp0SJNUcWynyYB+FQL+rizB+yWK5oNWlIQwJ18+ cV4s3X5Gbpi8+2e1bWT1AScTliZAPs4UoquqU0Mjbj5dbdQmotPPeDs8Lgikf44dPrc= X-Google-Smtp-Source: AGHT+IGf61DnJq/ei2oE23u97foUPC6x7eefPGA7ShtkWms1UlsA1c0oZx/Zl4EiuIBdZFRmCQEIiQ== X-Received: by 2002:ad4:4ee9:0:b0:6d8:a32e:8430 with SMTP id 6a1803df08f44-6e243b925dcmr376235496d6.8.1738639348341; Mon, 03 Feb 2025 19:22:28 -0800 (PST) Received: from gauss.local (104-184-204-59.lightspeed.livnmi.sbcglobal.net. [104.184.204.59]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e427cf664fsm656606d6.77.2025.02.03.19.22.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 19:22:27 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Feb 2025 22:22:24 -0500 Message-ID: <20250204032224.719107-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/pngdec: avoid hard failure on illegal sBIT chunks 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: 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: If a malformed chunk like sBIT appears but otherwise the stream is still parseable, we should print a warning and skip it rather than failing with an error. Signed-off-by: Leo Izen --- libavcodec/pngdec.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index f8cb61775e..b9c997ab0e 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1073,6 +1073,7 @@ static int decode_sbit_chunk(AVCodecContext *avctx, PNGDecContext *s, { int bits = 0; int channels; + int remainder = bytestream2_get_bytes_left(gb); if (!(s->hdr_state & PNG_IHDR)) { av_log(avctx, AV_LOG_ERROR, "sBIT before IHDR\n"); @@ -1080,16 +1081,17 @@ static int decode_sbit_chunk(AVCodecContext *avctx, PNGDecContext *s, } if (s->pic_state & PNG_IDAT) { - av_log(avctx, AV_LOG_ERROR, "sBIT after IDAT\n"); - return AVERROR_INVALIDDATA; + av_log(avctx, AV_LOG_WARNING, "Ignoring illegal sBIT chunk after IDAT\n"); + return 0; } channels = s->color_type & PNG_COLOR_MASK_PALETTE ? 3 : ff_png_get_nb_channels(s->color_type); - if (bytestream2_get_bytes_left(gb) != channels) { - av_log(avctx, AV_LOG_ERROR, "Invalid sBIT size: %d, expected: %d\n", - bytestream2_get_bytes_left(gb), channels); - return AVERROR_INVALIDDATA; + if (remainder != channels) { + av_log(avctx, AV_LOG_WARNING, "Invalid sBIT size: %d, expected: %d\n", remainder, channels); + /* not enough space left in chunk to read info */ + if (remainder < channels) + return 0; } for (int i = 0; i < channels; i++) { @@ -1098,8 +1100,8 @@ static int decode_sbit_chunk(AVCodecContext *avctx, PNGDecContext *s, } if (bits <= 0 || bits > (s->color_type & PNG_COLOR_MASK_PALETTE ? 8 : s->bit_depth)) { - av_log(avctx, AV_LOG_ERROR, "Invalid significant bits: %d\n", bits); - return AVERROR_INVALIDDATA; + av_log(avctx, AV_LOG_WARNING, "Invalid significant bits: %d\n", bits); + return 0; } s->significant_bits = bits; -- 2.48.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".