From patchwork Mon Jul 26 13:05:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3767625ios; Mon, 26 Jul 2021 06:05:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVzgUXkEPeMWOnmnLlNxf8MfdyqCmAuvO6ZcSsCNIve0RSmjNUzahUiu51z4Ah5zy2COpU X-Received: by 2002:a17:906:753:: with SMTP id z19mr8387451ejb.207.1627304735588; Mon, 26 Jul 2021 06:05:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627304735; cv=none; d=google.com; s=arc-20160816; b=T37tsF8FFHNV9XsxGqPKAdw4KGUeWwzG4cBcLN1UJYk8HuwqvAqXIBPjtjVF8lvXjM U+hpT5HUqUbq4NfmnKR61Ft2y7arZMDB06ithlDXiRkNC2xBhF5t+I1E4J4OxtlCe6B3 ViCIiyWZESnx1QWxQVMjcrALcT6cUSibfFm4xuAVaHPNgUATGsdbJQK4IGfkI6lKtZaA HqVCLRbfETGBAsRMScuFx6MTaJpQ2plFTZwJ4+DnPV3LBiMddTWIITTisrdZbglSrGuQ 8840knkK49fnuDpGx4uji07ym8/XP0rS/7CUNAe0EBoGpA9/kDcseYWoDsRReVAXHmHY BIww== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=vKknb9TAo5Lgx7vL02q6D7fcQ2f3pKqwwXj/iDckECU=; b=0QxNk1dsUqjRmpN9zZK8rb8WvF7PDEFVMjLnusJYUbSGtfnsGxPAVI7PaFwD4am6Po oQOtzBeVb5on3lUXZp+XmdmLhRllj39soj0Vw87bQjpPTAD+tJqh76PMncoKl0lhHcnm odptQJTSWiZxSqWXiaAgyhig4s74s4KMBBYMWflLlxofcIXi/ZPgpr8bm8cJz5lFuuu9 2/GrVNIXzw3i4aQoGkDAUNSA4fXxgjxSQmrHFxy0vCfIsLXHpiwYIpEHKjUhjqB3yC/S c7fD4raMQ92vsw/OyfukW5YpJjCOm29ChtmoeZIQkUfuxR4/ItdyL+6EDZJWTGiXJxJF kOmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cUJqG9jU; 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 t11si14839744ejd.8.2021.07.26.06.05.34; Mon, 26 Jul 2021 06:05: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=20161025 header.b=cUJqG9jU; 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 1993B6880FA; Mon, 26 Jul 2021 16:05:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B9BF68096C for ; Mon, 26 Jul 2021 16:05:24 +0300 (EEST) Received: by mail-pj1-f46.google.com with SMTP id j1so12784024pjv.3 for ; Mon, 26 Jul 2021 06:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=QgObepYB3TcSck1aUFB4tG/qnSYtYsNsKWZDnYKmxi8=; b=cUJqG9jUN8b4JgLPte8cJPt7Y6PcDHq1TuH1MKHOuxgj/WGsRpYbk19yeW+0oXXU8O ajFZUd/wj9U1n5+oYuJqNV5D+xn71zqTD3xnTmCq4gvZnENB2OlFTCZoi/RANn9ihHYF qCGwhODuFM86C4Sa5TMtbofKjc6z1jcyoL+v6e3SyY5D4Aqk+02d1WFrLH1Cn9lyQ73I JpHj5EF7BecwrhjghVwvXqrtqHrazYEBUqRCwgIThwFs2QjPQwk9VSmPZG2uCbZTovW0 iZlykumCxhvA6LmJSHkbyhDrM8dZvDQ25o4GiNWZIaJBZx9k6JGD12mfshZKBnnwNER0 N0Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=QgObepYB3TcSck1aUFB4tG/qnSYtYsNsKWZDnYKmxi8=; b=R3fRaq3GB8I295oyQJ1ulwdptbJVLBkJKYraj0xe0uFdg8n/B62/q3TFfhUJPFHNGu felGvDWMZCqRoy+fSU+MTB1rWi7/hD6L1Lfi4hdGxXm5f/43kFIg5UoSmAg17W2LF3Ht YDJpoW4K5YK0RQYhAhGPHESc1WD09fvmWBoreKcsrIQZJr349Eq+CVKyC6d0JjrsTd5M jh9bqRvvhSzKI5nbv2P51MYu4Mk4ZrapBXexM/zG2Mmh4flZzKoam24zkfuCXZ0KCDPe 2i/8XNa86qtOKo/TBPkkzub2iuf/NE7/ASNwGeWJkpHfD6iFJSboHlgoqXGzQK8mg8nT VLmw== X-Gm-Message-State: AOAM53278g2Ee+9o4hYJqhruwxfb1ozl9UYEiK3RVRxalSOoeomU9g+8 IVPpXL3iu2im4NVsyj3iCplirRCmciesYg== X-Received: by 2002:a65:554e:: with SMTP id t14mr9194436pgr.252.1627304722006; Mon, 26 Jul 2021 06:05:22 -0700 (PDT) Received: from localhost.localdomain ([181.23.89.80]) by smtp.gmail.com with ESMTPSA id y8sm44822492pfe.162.2021.07.26.06.05.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:05:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Jul 2021 10:05:06 -0300 Message-Id: <20210726130506.374-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/concat: finalize the AVBprint buffer immediately 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: r7xMP14imjn7 Don't attempt to read its contents in place. Fixes invalid reads when run under Valgrind. Signed-off-by: James Almer --- libavformat/concat.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/concat.c b/libavformat/concat.c index aec1f52d8e..64ac03e1d8 100644 --- a/libavformat/concat.c +++ b/libavformat/concat.c @@ -211,6 +211,7 @@ static av_cold int concatf_open(URLContext *h, const char *uri, int flags) struct concat_data *data = h->priv_data; AVIOContext *in = NULL; const char *cursor; + char *buf; int64_t total_size = 0; unsigned int nodes_size = 0; size_t i = 0; @@ -238,7 +239,11 @@ static av_cold int concatf_open(URLContext *h, const char *uri, int flags) return err; } - cursor = bp.str; + err = av_bprint_finalize(&bp, &buf); + if (err < 0) + return err; + + cursor = buf; while (*cursor) { struct concat_nodes *nodes; URLContext *uc; @@ -286,7 +291,7 @@ static av_cold int concatf_open(URLContext *h, const char *uri, int flags) data->nodes[i++].size = size; total_size += size; } - av_bprint_finalize(&bp, NULL); + av_free(buf); data->length = i; if (err < 0)