From patchwork Mon Sep 20 15:00:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 30378 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1532358iob; Mon, 20 Sep 2021 08:02:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8XTeOZDVP+QqkALS/9pr2fGWxOpqOz2WdE59HweBCLzB4TCgz1tbcU4DQbS30f2+7nb6b X-Received: by 2002:a17:906:6c94:: with SMTP id s20mr29926901ejr.152.1632150155812; Mon, 20 Sep 2021 08:02:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632150155; cv=none; d=google.com; s=arc-20160816; b=e8f4B4jr5geoCdYnsualdX0c0u03aPfDUBMc2WbJGLgFCyTriurpxu6RraWf6fGryN /LKwZAt+4HqaGGhQjylnDcKjgolMA0exyfybBf0EvG1naokSXQUHY0yHdmY9t++73IIb NXVQ5ZAhxhM84IdDfJGlZPp2NrDShgPTWpSf3rajuN5ksIlPROUEToG8+n/v1VRaJl6m daUhH+EnhIWQ4vVXptBbrSWrC65fcU4D/YsLbuLvB4dno0xfzQuNU9vDrYxeHzH1u4a4 gzuED4KUVMuXZtciGHRd5IICjpoYA0oOavpEXZ4wKRNutSkP5W05ZpIpHvukloJnM/KK fIDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=pfqomIcEFBiasMJE2Qdyi7uX0pydwy08BeB9RrbcbrU=; b=awStkgLzM3pEX8WWrRUfzWgJBeTVq34gzk7TvzQfWaXCApIxRnAf8Ea4gFKxwQZPGc yydV0W+MOxejsLd1s3thzoNgVlhQmlgMq9Q4xHzTxMoYufZ8e3QaGFrgldxN4L4jlxJU qhYRHFZWWfPSvHZ0wbL6unsSBKZ06tE0gqiUxYA0wlOexBxOYuREx5vL17EsWouyVlIV v3VIn8ErMu6Uwhm137CyOqW3ldmFG9o7ZzbbnEGFVKOCD6yfzqzIj8CDdOlrnjQ+0H2B HOk2FHPsFSfayGm1gZNDIm5qcYP/m3wS5YFCNl43XtbBxf/SonbjOu4Gs2S0Jv2lcKmg QdPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=j0sSeeu+; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c7si17349840ejc.571.2021.09.20.08.02.25; Mon, 20 Sep 2021 08:02:35 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=j0sSeeu+; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 315DF68AECA; Mon, 20 Sep 2021 18:02:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9189668AC6A for ; Mon, 20 Sep 2021 18:02:14 +0300 (EEST) Received: by mail-lf1-f48.google.com with SMTP id g41so36261415lfv.1 for ; Mon, 20 Sep 2021 08:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=35WfmLINIHpt385Vox/euuNA9UaO8AaxzK72sHuFtgA=; b=j0sSeeu+YAIULGJ85x1rTLSFuQcYnrQv05GCWVJ9EA13X7t4RN1FZ1Z9c0yFJiMAGd 84pv9Y71iWaTvHCQygVcDZy0isvcCln0x6IfDmCffaIKkpYcNqR1aRquCZljrdgZxxR9 RhbzhLEAfcN9IurVTt6pfcdOmEdEgmU+id9BYrYMGPkgqQ2P8oLJ3X3mB7OXlkorMDjc JWMHDsBx4aY1CvOJX1H1fG/LbfA/Nq6W+aA5FHrlFacIVaR9jM2VWl0VbTHJvp5DaZoA k5mjIIXULriBhNLE8j91B3YIxpDO1dJlaZPDl0YbF8bh+rAUO9uSAnESaNKAT+CrgXbr i2bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=35WfmLINIHpt385Vox/euuNA9UaO8AaxzK72sHuFtgA=; b=drrfMDJhl0FDJ1wu3VXudcB7tA74z4kdwOVi0RQvk7N/FcMLZj+8UNgcRcceIoCdVt pF867Iv8IBm10HfgRI/DJcj70kaszoG5K5UYku46EXHy5HvngQQlXygv+qfS+895AVEz EXblQ9jngE5ArNM5iyDoNCg8YrEJQbvbTCfgTfgBnI7Qn4Odd22uiRciH42juYf0/n5M SRYv4XRkD8rMIL+DEiiY4oE6b3gNTyTXF769nd7z+04rCyOHSPX8qOJF6pvsWTNLVSu5 ytnLCQn3FQLVWNcEsBBKowDTd77LGhxoWd/iTNWdggI6mY1WKZzzWfYk+p60OSRKo4OD n0Xg== X-Gm-Message-State: AOAM533Fs0lgmbAcshum8N7zaz0CcG/bYG9KayQbxNGq6AlT1dIJByQy KLxPAe0I1E85C4Q6v88HqivC36f2zg8= X-Received: by 2002:a05:6512:4008:: with SMTP id br8mr18606148lfb.23.1632150057378; Mon, 20 Sep 2021 08:00:57 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id v26sm1318300ljv.77.2021.09.20.08.00.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 08:00:56 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Sep 2021 18:00:46 +0300 Message-Id: <20210920150048.8790-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920150048.8790-1-jeebjp@gmail.com> References: <20210920150048.8790-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 3/5] avformat/{aviobuf, avio_internal}: add max_len argument to ff_read_string_to_bprint_overwrite 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5NmQn23yZUGU From: Jan Ekström This is especially useful when reading things such as null-terminated strings from MOV/MP4-likes, where the size of the box is known, but not the exact size of the string. Signed-off-by: Jan Ekström --- libavformat/avio_internal.h | 13 ++++++++++--- libavformat/aviobuf.c | 23 +++++++++++++++-------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 3b3ed3b619..e40adc944e 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -247,14 +247,21 @@ int64_t ff_read_line_to_bprint_overwrite(AVIOContext *s, struct AVBPrint *bp); /** * Read a whole null-terminated string of text from AVIOContext to an AVBPrint - * buffer overwriting its contents. Stop reading after reaching a \\0 or - * EOF. + * buffer overwriting its contents. Stop reading after reaching the maximum + * length, a \\0 or EOF. * * @param s the read-only AVIOContext * @param bp the AVBPrint buffer + * @param max_len the maximum length to be read from the AVIOContext. + * Negative (< 0) values signal that there is no known maximum + * length applicable. A maximum length of zero means that the + * AVIOContext is not touched, and the function returns + * with a read length of zero. In all cases the AVBprint + * is cleared. * @return the length of the read string not including the terminating null, * negative on error, or if the buffer becomes truncated. */ -int64_t ff_read_string_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp); +int64_t ff_read_string_to_bprint_overwrite(AVIOContext *s, struct AVBPrint *bp, + int64_t max_len); #endif /* AVFORMAT_AVIO_INTERNAL_H */ diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 3b6f9aed42..b43b24302b 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -809,13 +809,17 @@ typedef enum FFBPrintReadStringMode { } FFBPrintReadStringMode; static int64_t read_string_to_bprint(AVIOContext *s, AVBPrint *bp, - FFBPrintReadStringMode mode) + FFBPrintReadStringMode mode, + int64_t max_len) { int len, end; int64_t read = 0; char tmp[1024]; char c; + if (!max_len) + return 0; + do { len = 0; do { @@ -824,10 +828,11 @@ static int64_t read_string_to_bprint(AVIOContext *s, AVBPrint *bp, c == '\0'); if (!end) tmp[len++] = c; - } while (!end && len < sizeof(tmp)); + } while (!end && len < sizeof(tmp) && + ((max_len < 0) || (read + len < max_len))); av_bprint_append_data(bp, tmp, len); read += len; - } while (!end); + } while (!end && ((max_len < 0) || (read < max_len))); if (mode == FFBPrintReadLine && c == '\r' && avio_r8(s) != '\n' && !avio_feof(s)) @@ -843,12 +848,13 @@ static int64_t read_string_to_bprint(AVIOContext *s, AVBPrint *bp, } static int64_t read_string_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp, - FFBPrintReadStringMode mode) + FFBPrintReadStringMode mode, + int64_t max_len) { int64_t ret; av_bprint_clear(bp); - ret = read_string_to_bprint(s, bp, mode); + ret = read_string_to_bprint(s, bp, mode, max_len); if (ret < 0) return ret; @@ -860,12 +866,13 @@ static int64_t read_string_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp, int64_t ff_read_line_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp) { - return read_string_to_bprint_overwrite(s, bp, FFBPrintReadLine); + return read_string_to_bprint_overwrite(s, bp, FFBPrintReadLine, -1); } -int64_t ff_read_string_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp) +int64_t ff_read_string_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp, + int64_t max_len) { - return read_string_to_bprint_overwrite(s, bp, FFBPrintReadString); + return read_string_to_bprint_overwrite(s, bp, FFBPrintReadString, max_len); } int avio_get_str(AVIOContext *s, int maxlen, char *buf, int buflen)