From patchwork Wed Nov 28 11:16:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Semashev X-Patchwork-Id: 11202 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7422F44E0A2 for ; Wed, 28 Nov 2018 13:16:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 205BD68A704; Wed, 28 Nov 2018 13:16:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B27D68A704 for ; Wed, 28 Nov 2018 13:16:49 +0200 (EET) Received: by mail-lf1-f41.google.com with SMTP id p17so19051579lfh.4 for ; Wed, 28 Nov 2018 03:16:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pvKR/tD3/8EslkwKTepB3ygCNcV+M9y33yM6CEwhdvI=; b=gRgrar3v7HApMRKuPpydgjeEWbTqO48gKNPEKrMJOESJSb4lEup86SI6HWR3rhnYIc H+ddfLAoX9yhlFNYn7i7lk8J5OEbjZcj3ej7TEfIy1la/Ij1cM96fLng8HrPdlcj6qhx ssy2kWQgi1dkULg3kMCRTp5wnnojM3R1IvbMwh3ztyftSJaT9VzjEkRZqfwTZfAuNMQc DDB7+oQkBMEayNVrW0Zq5E09MtwTIr2HY+tQYJdVtSb+6zS8A6OfLrXRI2PLNgUuaazo vyAYZtvaQDDDzt5hI2pU+kUY8fQ+wMo7CvK5XtLhjoB/iwfAXlyKSqB5PEsk2lFa6hH5 1HsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pvKR/tD3/8EslkwKTepB3ygCNcV+M9y33yM6CEwhdvI=; b=WMXx+JjxxyCtm8DMNt2EgKDSu1LJVBfjoGmHDUTiLbBkUCJRNzCqVy8IR1/CHDqOSP 54o7RyeRr/kQlT4msrwuu8XF6WfKk9tc2LIeZqpgh4FN/VKKHQ6sdobb22ss2ac0DrPr S3YbRs9onT+mxEfw6Q5rw1qEzJQqMCQX6Aj3pjgSoCTsUAGz5q2sKr5ANGxEM8xKfMqs RU9SptBhjC/KNffW+ZeXAmdpvdbbrKblxplArv4wryG0p9fOhhKoHIF+hCMHtrfguVtf 3MirHOAI6uCU6iBKz0B7mawye2rFA7ych5ONkXMv4tNV1k1dX/xI2zaztv5jvF3WIOy+ Y3Rg== X-Gm-Message-State: AGRZ1gJfAnrTsoeiRx/3g/P+NfYBQKZCnwQ30leP1ITqjU9xjh2Q7V7n U7X4OEUNoi6H6TCn573BUoDCUK/9 X-Google-Smtp-Source: AJdET5eXInca7yYX/1x6GCwr9zUV6RHCeqeaSnFlCZlWu0uooyoz2/0PKlFRLuu98bIe/gmKk8fi+w== X-Received: by 2002:a19:10da:: with SMTP id 87mr20972960lfq.60.1543403813899; Wed, 28 Nov 2018 03:16:53 -0800 (PST) Received: from localhost.localdomain (broadband-37-110-31-10.ip.moscow.rt.ru. [37.110.31.10]) by smtp.gmail.com with ESMTPSA id k21-v6sm1076550ljc.15.2018.11.28.03.16.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 03:16:53 -0800 (PST) From: Andrey Semashev To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Nov 2018 14:16:49 +0300 Message-Id: <20181128111649.16056-1-andrey.semashev@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/dashenc: Fix file URI handling when deleting files. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andrey Semashev Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The URI used to open the output streams may be an actual URI with "file" scheme, according to https://tools.ietf.org/html/rfc8089. This commit makes file deletion routine recognize file URIs and extract the actual filesystem path from it. It also fixes strerror use, which may not be thread-safe. --- libavformat/dashenc.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 6ce70e0076..e59fa0944e 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -25,6 +25,7 @@ #include #endif +#include "libavutil/error.h" #include "libavutil/avassert.h" #include "libavutil/avutil.h" #include "libavutil/avstring.h" @@ -1326,8 +1327,32 @@ static void dashenc_delete_file(AVFormatContext *s, char *filename) { av_dict_free(&http_opts); ff_format_io_close(s, &out); - } else if (unlink(filename) < 0) { - av_log(s, AV_LOG_ERROR, "failed to delete %s: %s\n", filename, strerror(errno)); + } else { + const char* path = filename; + // Check if the filename is a file URI. https://tools.ietf.org/html/rfc8089#section-2 + if (av_strncasecmp(path, "file:", sizeof("file:") - 1) == 0) { + path += sizeof("file:") - 1; + if (path[0] == '/' && path[1] == '/') { + // The URI may have an authority part. Check that the authority does not contain + // a host name. We cannot access filesystem on a different host. + path += 2; + if (path[0] != '/') { + if (strncmp(path, "localhost", sizeof("localhost") - 1) == 0) { + path += sizeof("localhost") - 1; + } else { + av_log(s, AV_LOG_ERROR, "cannot delete file on a remote host: %s\n", filename); + return; + } + } + } + } + + if (unlink(path) < 0) { + int err = AVERROR(errno); + char errbuf[128]; + av_strerror(err, errbuf, sizeof(errbuf)); + av_log(s, (err == AVERROR(ENOENT) ? AV_LOG_WARNING : AV_LOG_ERROR), "failed to delete %s: %s\n", path, errbuf); + } } }