From patchwork Thu Mar 9 12:57:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40624 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp306979pzb; Thu, 9 Mar 2023 04:57:59 -0800 (PST) X-Google-Smtp-Source: AK7set8r4eJDxVI0xdQ8Yr2UW4xje2ngNZeOQHFAs+WWZ9zeptzyoJgP6yY6IkCDzlkKwJa51l9D X-Received: by 2002:a17:907:31ca:b0:88d:f759:15b0 with SMTP id xf10-20020a17090731ca00b0088df75915b0mr25574756ejb.45.1678366679121; Thu, 09 Mar 2023 04:57:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678366679; cv=none; d=google.com; s=arc-20160816; b=JwY2z8URy/6uGxWDRi+rPFjEIxqzXKlkgs7GBCTT+nYw4cJ2KPY+eB99I0xR0o+n62 EX1J3PGZYMDSEJO/6DRCKQY19PSXuKnf29ChTVDbSSSBFe2tOH762d47ligDJsiytpoT B2DLY3Z0qzxADhw8/fM2D3s1lQ1ERZuZQHeX47N4ZjMUQpXM7xABvpPBrl3EDRw27QC3 P6K7S0+kd2N473GwFFmVRW1mlnxms6uzTTRuJW7YKuJjNaMQUpgyT3gd9eaCRHgUI6sc 0CqwE7Os6YhLLJ3OXg311doDpeP4oUwycKxsOsNWHEG/9qanEzqNXXVjG5wqUvy8HSYw 8R8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=9KuyfPpvKUdiObW22gR0u4kkdqkRn873DKxC9U5QDuw=; b=xIBt9LLMaTDt7D0tgHgFZ0F7qE7BaOvvHalP56o5cGrRAyGjjZayY1BXsI3ivGMefN ILIaLrjDY6DyEdrX2airImr+vwtlNdXpDiVzCYL0QEVu0e3lnKHYbbT4Svn0h//otFoY /YduwX5woqFfkbGx65B39qPwCTxeeQyhJPBLsmrtixoOzuXbY+YLrv97kGx6uWb3SP3h HEZvklQimSKxz4nWVsT6syswRbwV2qK/u4R0WOfMf3/KAA1gmYNf2OoYa6d8IBgXGlK/ jQJKcv/6svjBduixxB+40ppsUtsPOFKl0smZTg+rZvWr3Ey45N0i9/roQXJ54/sy1n4V WkrA== 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 qk33-20020a1709077fa100b00906314690c0si21070446ejc.752.2023.03.09.04.57.58; Thu, 09 Mar 2023 04:57:59 -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 C389668BD56; Thu, 9 Mar 2023 14:57:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7BB168BCFB for ; Thu, 9 Mar 2023 14:57:22 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id A5B0C10000D for ; Thu, 9 Mar 2023 12:57:21 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 9 Mar 2023 13:57:17 +0100 Message-Id: <20230309125717.29821-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230309125717.29821-1-michael@niedermayer.cc> References: <20230309125717.29821-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/lcldec: More space for rgb24 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4xhPjzUno7bT Fixes: Ticket 10239 Fixes: zlib_306_306_rgb24.av Signed-off-by: Michael Niedermayer --- libavcodec/lcldec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index f9a0755e4d..eb5139a5c5 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -152,6 +152,8 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, i if (expected != (unsigned int)zstream->total_out) { av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lu)\n", expected, zstream->total_out); + if (expected > (unsigned int)zstream->total_out) + return (unsigned int)zstream->total_out; return AVERROR_UNKNOWN; } return zstream->total_out; @@ -278,12 +280,13 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, ret = zlib_decomp(avctx, buf + 8 + mthread_inlen, len - 8 - mthread_inlen, mthread_outlen, mthread_outlen); if (ret < 0) return ret; + len = c->decomp_size; } else { int ret = zlib_decomp(avctx, buf, len, 0, c->decomp_size); if (ret < 0) return ret; + len = ret; } encoded = c->decomp_buf; - len = c->decomp_size; break; #endif default: @@ -521,7 +524,7 @@ static av_cold int decode_init(AVCodecContext *avctx) partial_h_supported = 1; break; case IMGTYPE_RGB24: - c->decomp_size = basesize * 3; + c->decomp_size = FFALIGN(avctx->width*3, 4) * avctx->height; max_decomp_size = max_basesize * 3; avctx->pix_fmt = AV_PIX_FMT_BGR24; av_log(avctx, AV_LOG_DEBUG, "Image type is RGB 24.\n");