From 2d3f8740e7f269f383f3469a424e00253ebbf83c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 30 Dec 2024 23:38:53 +0100 Subject: Restrict name part of ISDCF name more (#2920). This disallows + and . from the name part of an ISDCF name. I'm not 100% convinced about +, but . seems reasonable. This also fixes the case where you do "copy as name" with a name that should be transliterated, and the non-transliterated characters re-appear. --- src/lib/film.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/film.cc b/src/lib/film.cc index 1ac519011..ebbdfe013 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -920,7 +920,7 @@ Film::isdcf_name (bool if_created_now) const fixed_name = fixed_name.substr(0, Config::instance()->isdcf_name_part_length()); - isdcf_name += fixed_name; + isdcf_name += careful_string_filter(fixed_name, L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-"); if (dcp_content_type()) { isdcf_name += "_" + dcp_content_type()->isdcf_name(); -- cgit v1.2.3