From: Carl Hetherington <cth@carlh.net>
Date: Tue, 3 Mar 2020 09:26:02 +0000 (+0100)
Subject: Fix crash in verification due to mismatched wxString::Format placeholder.
X-Git-Tag: v2.15.47
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f6557e4bedd788a026d48fe883cb48a1070dc886

Fix crash in verification due to mismatched wxString::Format placeholder.
---

diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc
index a61d9bf11..c3cf5cc22 100644
--- a/src/wx/verify_dcp_dialog.cc
+++ b/src/wx/verify_dcp_dialog.cc
@@ -84,7 +84,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 		case dcp::VerificationNote::PICTURE_HASH_INCORRECT:
 			text = wxString::Format(
 				_("The hash of the picture asset %s does not agree with the PKL file.  This probably means that the asset file is corrupt."),
-				std_to_wx(i.file()->filename().string()).data()
+				std_to_wx(i.file()->filename().string())
 				);
 			break;
 		case dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE:
@@ -93,7 +93,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 		case dcp::VerificationNote::SOUND_HASH_INCORRECT:
 			text = wxString::Format(
 				_("The hash of the sound asset %s does not agree with the PKL file.  This probably means that the asset file is corrupt."),
-				std_to_wx(i.file()->filename().string()).data()
+				std_to_wx(i.file()->filename().string())
 				);
 			break;
 		case dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE:
@@ -111,14 +111,14 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 		case dcp::VerificationNote::XML_VALIDATION_ERROR:
 			if (i.line()) {
 				text = wxString::Format(
-					_("The XML in %s is malformed on line %d."),
-					std_to_wx(i.file()->filename().string()).data(),
+					_("The XML in %s is malformed on line %" PRIu64 "."),
+					std_to_wx(i.file()->filename().string()),
 					i.line().get()
 					);
 			} else {
 				text = wxString::Format(
 					_("The XML in %s is malformed."),
-					std_to_wx(i.file()->filename().string()).data()
+					std_to_wx(i.file()->filename().string())
 					);
 			}
 			break;