From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 8F9864D236 for ; Sat, 31 May 2025 01:51:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 46A2B68D9CC; Sat, 31 May 2025 04:50:54 +0300 (EEST) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C420368D934 for ; Sat, 31 May 2025 04:50:47 +0300 (EEST) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-b1fde81de05so1512550a12.1 for ; Fri, 30 May 2025 18:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748656246; x=1749261046; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=QnYiXTVcLYUwP4o67OOTeB/29eGOKoxJ5W6egQYxvXU=; b=ThYLbN+n1S5B9zEIqNcFswzzGZQ4xzn/dt5TUxby28BQJ79MLhZVfcvUfA65ZcUJoE bQHke9T2PIEhfgh0HHQz/iwcgO/3luYMsRw6Qu4nVVYErYhRwH1g0AyYEVN79gWbRU2L xLUiH4mh9OevpabnbMH8vFZ5QUeX1GmDXS0apr7jY+TlDrjKvvX4JrKFsoV+sDYVyJKK J6NogzhFgF1Cj7hiNABLdSBLVI6heovLssjek/3YPphA6xjEfR1RubQLQ3knEmxE8p6o 30WXp0hlJjxtiHca20QUAMpL4pesjlyBXOv58teNUyLmM394zzAdYT9O104wqY9GeJ2p pg8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748656246; x=1749261046; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=QnYiXTVcLYUwP4o67OOTeB/29eGOKoxJ5W6egQYxvXU=; b=xD/HC+OWgRsNiuO8xFIgrV5mY2eSufzkdQR6h5HT2KMtCkjUEBC1DQJkRKABGddbbH BAUmjXYNfWlVSNZ3hiaRN7qOcN5PvWi8wJP2yBjQ6bVhSeIV4BBbTO6DB6ed/i0IGrkY w46++IjmOcJq7LUHj/eXlHme0WYkFV0Qg2FENdEZyo5FkZLqpoCsjnHj0zHPZBCy1bmE XEbLdWJOFtstAiKi3GYaDmuD8N5bngf6T4y88nC1sPencvaRO2a9g3q4gM2smNbVEJoL eEzKHg+lLTa5SaVvU5h4lZUBGC5YxHVAFgNytv2ECThRY3WsHPs6XySOvYXugh/djVkO 5BLQ== X-Gm-Message-State: AOJu0YxSqej5o4E3Yym/w+VklWneIFw0V1zLUq26asfgDfh3/TUB3ved QF2POge5qHLj3OqfbCfWQ7iW147Zr6P2lrJJ7r9z2YVKhrJlU7jaPzrlgsS61Q== X-Gm-Gg: ASbGncu9zBMU/EHxTZOWtVFca5P6vtFhWqkKLNaAK9OcnwntIdzkgJ/kRqgHrSnsM8V 3Gj5Kv9Q4oEs4XprXO9KspMqFvGbkoVwvuI0xwQTyZ4oS0kvjPybKiesVN4a69sFjDSBDEuye/c kvCyarE7xYw82g6PvLxHDT165uEtDuy2vji/zR5H3SlluNeV+hQ97M2lISqn7fzJ089iPiZg3Cg g1x0fcBFY+qvDM9/zWnuniAwq3t4p6j/wWOrvMPK71BxdDeexNnodZaubJQKzwQtrcoQrF9q/Kd /D7s+bZjFJj4KmwjUVzcKNrL7gnFXRHELaS3I1c5UUuRq1Hv8eueBWqvPD6cQLzWr55Pdw== X-Google-Smtp-Source: AGHT+IEveis+QaPU/ZPCm2gzLSkhQEUsYjCZ9BVGdos8uACWGs41AGiNAdRxMfh+ah3iLUxq1S6b4g== X-Received: by 2002:a17:90b:39c5:b0:2fc:3264:3666 with SMTP id 98e67ed59e1d1-31241e9767fmr8503149a91.30.1748656246084; Fri, 30 May 2025 18:50:46 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23506bd974asm34306845ad.97.2025.05.30.18.50.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 May 2025 18:50:45 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <48fc3a68105dbc1631ec22657a141d927acafa9d.1748656229.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sat, 31 May 2025 01:50:29 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/2] fftools/resman: use inflate loop with increasing buffer size 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: softworkz 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: From: softworkz Signed-off-by: softworkz --- fftools/resources/resman.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/fftools/resources/resman.c b/fftools/resources/resman.c index f098bd6687..0dae272c89 100644 --- a/fftools/resources/resman.c +++ b/fftools/resources/resman.c @@ -76,7 +76,7 @@ static int decompress_gzip(ResourceManagerContext *ctx, uint8_t *in, unsigned in memset(&strm, 0, sizeof(strm)); // Allocate output buffer with extra byte for null termination - buf = av_mallocz(chunk + 1); + buf = av_realloc(NULL, chunk + 1); if (!buf) { av_log(ctx, AV_LOG_ERROR, "Failed to allocate decompression buffer\n"); return AVERROR(ENOMEM); @@ -92,21 +92,31 @@ static int decompress_gzip(ResourceManagerContext *ctx, uint8_t *in, unsigned in strm.avail_in = in_len; strm.next_in = in; - strm.avail_out = chunk; - strm.next_out = buf; - ret = inflate(&strm, Z_FINISH); - if (ret != Z_OK && ret != Z_STREAM_END) { - av_log(ctx, AV_LOG_ERROR, "Inflate failed: %d, %s\n", ret, strm.msg); - inflateEnd(&strm); - av_free(buf); - return (ret == Z_STREAM_END) ? Z_OK : ((ret == Z_OK) ? Z_BUF_ERROR : ret); - } + do { + strm.avail_out = chunk - strm.total_out; + strm.next_out = buf + strm.total_out; - if (strm.avail_out == 0) { - // TODO: Error or loop decoding? - av_log(ctx, AV_LOG_WARNING, "Decompression buffer may be too small\n"); - } + ret = inflate(&strm, Z_FINISH); + if (ret != Z_OK && ret != Z_STREAM_END && ret != Z_BUF_ERROR) { + av_log(ctx, AV_LOG_ERROR, "Inflate failed: %d, %s\n", ret, strm.msg); + inflateEnd(&strm); + av_free(buf); + return AVERROR(EINVAL); + } + + if (strm.avail_out == 0) { + chunk *= 8; + uint8_t *tmp_buf = av_realloc(buf, chunk + 1); + if (!tmp_buf) { + inflateEnd(&strm); + av_free(buf); + return AVERROR(ENOMEM); + } + + buf = tmp_buf; + } + } while (ret != Z_STREAM_END); *out_len = chunk - strm.avail_out; buf[*out_len] = 0; // Ensure null termination -- ffmpeg-codebot _______________________________________________ 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".