From 77df016da7f8e1ee3f31c2a0d147c939e78add97 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 7 Sep 2023 23:24:06 +0200 Subject: Sanitise asset names after potentially failed %-based substitutions (#945). If there's a %x in the format string, where %x is not recognised, we should at least remove the %. --- src/lib/util.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/util.cc b/src/lib/util.cc index 6339cb6a6..1ce288686 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -733,9 +733,9 @@ asset_filename (shared_ptr asset, string type, int reel_index, int r values['r'] = raw_convert(reel_index + 1); values['n'] = raw_convert(reel_count); if (summary) { - values['c'] = careful_string_filter(summary.get()); + values['c'] = summary.get(); } - return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + extension); + return careful_string_filter(Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + extension)); } -- cgit v1.2.3