summaryrefslogtreecommitdiff
path: root/src/verify.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-04-26 16:42:43 +0200
committerCarl Hetherington <cth@carlh.net>2023-04-26 16:42:47 +0200
commit928b10e8f4195c29a31fe643e38fb00b6c1b8953 (patch)
treec09ebb9b816b7840312f12c8ef80a4fcce63cf11 /src/verify.cc
parentaae2f02038b1cd36e1b1bf2e4f0821e86cff2841 (diff)
Give better errors when invalid urn:uuid: strings are found (DoM #2521).
Diffstat (limited to 'src/verify.cc')
-rw-r--r--src/verify.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/verify.cc b/src/verify.cc
index b49695c7..c42a10d4 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -1780,6 +1780,8 @@ dcp::verify (
notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
} catch (MXFFileError& e) {
notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
+ } catch (BadURNUUIDError& e) {
+ notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
} catch (cxml::Error& e) {
notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
}
@@ -1859,7 +1861,7 @@ dcp::note_to_string (VerificationNote note)
case VerificationNote::Code::INVALID_XML:
return String::compose("An XML file is badly formed: %1 (%2:%3)", note.note().get(), note.file()->filename(), note.line().get());
case VerificationNote::Code::MISSING_ASSETMAP:
- return "No ASSETMAP or ASSETMAP.xml was found.";
+ return "No valid ASSETMAP or ASSETMAP.xml was found.";
case VerificationNote::Code::INVALID_INTRINSIC_DURATION:
return String::compose("The intrinsic duration of the asset %1 is less than 1 second.", note.note().get());
case VerificationNote::Code::INVALID_DURATION: