diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-02-20 00:58:31 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-02-20 00:58:31 +0000 |
| commit | 1460bda6f80b6529e31a1a63029dc0ec5f7d0ae8 (patch) | |
| tree | 153f0b437ceff79e6aa305aea3bc50388109d629 /src/lib/util.cc | |
| parent | 14247790278d45e98004ef54b8ba700d10f3193a (diff) | |
Be more careful about allowing possibly-trouble-causing characters in DCP filenames.
Diffstat (limited to 'src/lib/util.cc')
| -rw-r--r-- | src/lib/util.cc | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index 3f0c34a15..38770f4e3 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -658,7 +658,7 @@ video_asset_filename (shared_ptr<dcp::PictureAsset> asset, int reel_index, int r values['r'] = raw_convert<string> (reel_index + 1); values['n'] = raw_convert<string> (reel_count); if (summary) { - values['c'] = summary.get(); + values['c'] = careful_string_filter (summary.get()); } return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf"); } @@ -671,7 +671,7 @@ audio_asset_filename (shared_ptr<dcp::SoundAsset> asset, int reel_index, int ree values['r'] = raw_convert<string> (reel_index + 1); values['n'] = raw_convert<string> (reel_count); if (summary) { - values['c'] = summary.get(); + values['c'] = careful_string_filter (summary.get()); } return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf"); } @@ -687,3 +687,22 @@ relaxed_string_to_float (string s) return lexical_cast<float> (s); } } + +string +careful_string_filter (string s) +{ + /* Filter out `bad' characters which `may' cause problems with some systems (either for DCP name or filename). + There's no apparent list of what really is allowed, so this is a guess. + Safety first and all that. + */ + + string out; + string const allowed = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%."; + for (size_t i = 0; i < s.size(); ++i) { + if (allowed.find (s[i]) != string::npos) { + out += s[i]; + } + } + + return out; +} |