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 6E114429DB for ; Mon, 10 Jan 2022 19:56:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C81FC68AEA4; Mon, 10 Jan 2022 21:56:01 +0200 (EET) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1461A68AE72 for ; Mon, 10 Jan 2022 21:55:55 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 663E2E626D for ; Mon, 10 Jan 2022 20:55:54 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VWI2f5J_ndXH for ; Mon, 10 Jan 2022 20:55:52 +0100 (CET) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id E45C0E5F3C for ; Mon, 10 Jan 2022 20:55:51 +0100 (CET) Date: Mon, 10 Jan 2022 20:55:51 +0100 (CET) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: Message-ID: <3e07955-5ee-4d10-373e-1592efab04e@passwd.hu> References: <20220101192001.13688-1-cus@passwd.hu> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avformat/imfdec: do not use filesize when reading XML file 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sun, 9 Jan 2022, Pierre-Anthony Lemieux wrote: > On Sat, Jan 8, 2022 at 10:49 AM Marton Balint wrote: >> >> >> >> On Sat, 1 Jan 2022, Marton Balint wrote: >> >>> Signed-off-by: Marton Balint >>> --- >>> libavformat/imfdec.c | 15 ++++----------- >>> 1 file changed, 4 insertions(+), 11 deletions(-) >>> >>> diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c >>> index f17064cfcd..ef1e7cf206 100644 >>> --- a/libavformat/imfdec.c >>> +++ b/libavformat/imfdec.c >>> @@ -73,8 +73,6 @@ >>> #include >>> #include >>> >>> -#define MAX_BPRINT_READ_SIZE (UINT_MAX - 1) >>> -#define DEFAULT_ASSETMAP_SIZE 8 * 1024 >>> #define AVRATIONAL_FORMAT "%d/%d" >>> #define AVRATIONAL_ARG(rational) rational.num, rational.den >>> >>> @@ -279,7 +277,6 @@ static int parse_assetmap(AVFormatContext *s, const char *url) >>> const char *base_url; >>> char *tmp_str = NULL; >>> int ret; >>> - int64_t filesize; >>> >>> av_log(s, AV_LOG_DEBUG, "Asset Map URL: %s\n", url); >>> >>> @@ -289,13 +286,10 @@ static int parse_assetmap(AVFormatContext *s, const char *url) >>> if (ret < 0) >>> return ret; >>> >>> - filesize = avio_size(in); >>> - filesize = filesize > 0 ? filesize : DEFAULT_ASSETMAP_SIZE; >>> + av_bprint_init(&buf, 0, INT_MAX); // xmlReadMemory uses integer length >>> >>> - av_bprint_init(&buf, filesize + 1, AV_BPRINT_SIZE_UNLIMITED); >>> - >>> - ret = avio_read_to_bprint(in, &buf, MAX_BPRINT_READ_SIZE); >>> - if (ret < 0 || !avio_feof(in) || buf.len == 0) { >>> + ret = avio_read_to_bprint(in, &buf, SIZE_MAX); >>> + if (ret < 0 || !avio_feof(in)) { >>> av_log(s, AV_LOG_ERROR, "Unable to read to asset map '%s'\n", url); >>> if (ret == 0) >>> ret = AVERROR_INVALIDDATA; >>> @@ -311,8 +305,7 @@ static int parse_assetmap(AVFormatContext *s, const char *url) >>> } >>> base_url = av_dirname(tmp_str); >>> >>> - filesize = buf.len; >>> - doc = xmlReadMemory(buf.str, filesize, url, NULL, 0); >>> + doc = xmlReadMemory(buf.str, buf.len, url, NULL, 0); >>> >>> ret = parse_imf_asset_map_from_xml_dom(s, doc, &c->asset_locator_map, base_url); >>> if (!ret) >> >> Will apply the series tomorrow. > > It looks like the same code exists at libavformat/imf_cpl.c [1]. > > [1] https://github.com/FFmpeg/FFmpeg/blob/ce4d459db186a7d8ac842685cd6256c9ac1b7f25/libavformat/imf_cpl.c#L795 > > Does it need to be changed there as well? Yes, preferably that should be changed as well. No that it matters too much, it just better/simpler not to depend on filesize. Thanks, Marton _______________________________________________ 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".