From patchwork Tue Jul 27 15:00:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp4929909pxb; Tue, 27 Jul 2021 08:01:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYvgVbSo4SKboaUAclFGyoxW6pgTEBMb0H6XE8xRu9Z/mViUX9XDzlrONkhv/+bf/1lT8w X-Received: by 2002:a17:907:9604:: with SMTP id gb4mr22299982ejc.142.1627398073806; Tue, 27 Jul 2021 08:01:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627398073; cv=none; d=google.com; s=arc-20160816; b=TnmKBhIyiW0Q4HA0sHO5cxSIOPP6h3qZtaaqBQnt1UhOnTmRQi53YR5+gZ3v1W5Oo2 r8UiI9VTBamI73gSE9l5Klpta/qLAKCM24pVyzrhS91McoiYUwfa8VpNEJcRDNaTOwhy xangXQm1c670ViiDfuzVYMlTBeBChTxRJNXMcoUCGukHsfCaYFCoJCJynKne0ZUecXag Qns4I1KG+jtRZ9pk/Dm0Tkkx8FdLuYFiYHNzWYMNCsptMGb0jiJfcQ32OxVHY8WtRO7o QGwGQM3KD23X4yOQLdk3Qa5GdO/Gf4co5vdZVfTwpYnFHW3w+y9yfvQs/Fecrt3MR1mR S7Lw== 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=aJQItM7gSb1SK9V9zemwmZI88ISPu3iUWnbS9pnsIP4=; b=Ml8KpIvBDP8ESNXan42QUevmkR7yB63+GYweCL1D2/Gq2NjQAtU2gffbdNYgIVSwZT tf/H4l+xoLrevsEIbffT1EkeBwrkYYSNrxVl9QBVMsS0rtisYhLBWbNFWwtF9o8d8e7z No17BtD43zFCVK5khkTCM9VEa6YoW8e30fqE27DwuoofDQdjjtvAcYuOFXjZY44WwcCL i2qma7nuCofgU+S9PnIbq9wLb+U1wX18wyL5WVZlFT3t706Ch7+H5RuvMpGTwZD4+ZeQ vEIoTzWT8Cr5m/EReBv3M+8HJgYtOBQSzTpC7Tzch4yR6jHsAasEF+pgk4t+hDgzKmc7 nSXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=aZkcrJoK; 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 q18si3708444edi.368.2021.07.27.08.01.12; Tue, 27 Jul 2021 08:01:13 -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=aZkcrJoK; 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 2A75F68818D; Tue, 27 Jul 2021 18:01:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C633680137 for ; Tue, 27 Jul 2021 18:01:03 +0300 (EEST) Received: by mail-pj1-f54.google.com with SMTP id m10-20020a17090a34cab0290176b52c60ddso5220831pjf.4 for ; Tue, 27 Jul 2021 08:01:03 -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=RUnGYkOg9X0c8/k+IWu1Es5aXiVRoI/8btteud3lujw=; b=aZkcrJoKIh1Zv7817GA8ql5EFzAPNZquBc/shckxIDA4PQXLczJKcplMMVttHmVHwK BNx6LQVM6KAY4Uj6IkNXLnW8jMdbKx3Mjzk5mRA8WYoPAg5nW+LU12af7rk2k8VEk0Iy eW5UPipUEzUWehiz4udBDi2itr5cM/JqAzwccZRSpIMv7COKYJtEeCPEytHeh3NsGIEx Icjw3zOdPkhv0+hKsZzcQGp0ysrwKNt2KOZXMhy65HuPpWL9b1wLesJSwF/XF9ESPvnF ZbzIUxkYA2cpe7ksX78EVbNez2ZU+Ljwkozr8CHrgb5C1crSiN8Lkb0BDTIXoJYC0Iqn BeFg== 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=RUnGYkOg9X0c8/k+IWu1Es5aXiVRoI/8btteud3lujw=; b=Qyn9o5yhjaq+1LG/K1J7dM4Zjthfhw3sn0v9+7MpqiY6kUUqCDNS5/v3DBOMhBW9E4 VCnnsdthGeYG7HopWPo1jU7RzTEFoNtqCL/bgnj5mfztDqSLdC8MvlFP/bLLI3CbAiEg SgyCpzO82IgLc7Oox8+dzucpNFbqlSi+YXrjGi06GiKIzxLIR22vMjg/wHUmcgklqhe/ 3to1hQxK8Gv2hr5/gITmbDs3ZvkhTVeKOlythS8+QdppMkstcnxHQeEay6Unmssj4lWu kd4r8HeseR9uDyqHFrJ22SraeMdttR//eDX6yuT+QSKeSnnSQHR8a3+7+/fwMPAzmTff 001Q== X-Gm-Message-State: AOAM530JAbu+mDhoARq09Nm3pqSLUvx7zmDVU2tVlyikTt9bhKgDUKk2 +EU2Kv4U5bF8hEjEkicuFAWrt4aLbRE= X-Received: by 2002:a17:90a:ead0:: with SMTP id ev16mr4717113pjb.209.1627398061215; Tue, 27 Jul 2021 08:01:01 -0700 (PDT) Received: from localhost.localdomain ([191.84.244.212]) by smtp.gmail.com with ESMTPSA id x10sm4249817pfd.175.2021.07.27.08.01.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 08:01:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Jul 2021 12:00:45 -0300 Message-Id: <20210727150045.766-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/concat: check the terminating character returned by av_get_token() 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: 2AF6mX0exnO1 Don't attempt to increase the cursor pointer if it was \0. Fixes invalid reads. Signed-off-by: James Almer --- libavformat/concat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/concat.c b/libavformat/concat.c index aec1f52d8e..2560811ff9 100644 --- a/libavformat/concat.c +++ b/libavformat/concat.c @@ -251,7 +251,8 @@ static av_cold int concatf_open(URLContext *h, const char *uri, int flags) err = AVERROR(ENOMEM); break; } - cursor++; + if (*cursor) + cursor++; if (++len == SIZE_MAX / sizeof(*nodes)) { av_free(node_uri);