From 169f462eea87a8fc67d4d21bbb3fb0f842e91a90 Mon Sep 17 00:00:00 2001
From: sdottaka <none@none>
Date: Sun, 3 Feb 2013 23:19:22 -0800
Subject: [PATCH] Fix runtime error "string iterator not dereferencable"

---
 Src/ChildFrm.cpp    | 2 +-
 Src/DirFrame.cpp    | 2 +-
 Src/HexMergeFrm.cpp | 2 +-
 Src/MainFrm.cpp     | 2 +-
 Src/OpenFrm.cpp     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Src/ChildFrm.cpp b/Src/ChildFrm.cpp
index 6b527ae49..1d167fe64 100644
--- a/Src/ChildFrm.cpp
+++ b/Src/ChildFrm.cpp
@@ -440,7 +440,7 @@ void CChildFrame::GetMessageString(UINT nID, CString& rMessage) const
 {
 	// load appropriate string
 	const String s = theApp.LoadString(nID);
-	if (!AfxExtractSubString(rMessage, &*s.begin(), 0))
+	if (!AfxExtractSubString(rMessage, s.c_str(), 0))
 	{
 		// not found
 		TRACE1("Warning: no message line prompt for ID 0x%04X.\n", nID);
diff --git a/Src/DirFrame.cpp b/Src/DirFrame.cpp
index 21e4326ca..57223f2a8 100644
--- a/Src/DirFrame.cpp
+++ b/Src/DirFrame.cpp
@@ -161,7 +161,7 @@ void CDirFrame::GetMessageString(UINT nID, CString& rMessage) const
 {
 	// load appropriate string
 	const String s = theApp.LoadString(nID);
-	if (!AfxExtractSubString(rMessage, &*s.begin(), 0))
+	if (!AfxExtractSubString(rMessage, s.c_str(), 0))
 	{
 		// not found
 		TRACE1("Warning: no message line prompt for ID 0x%04X.\n", nID);
diff --git a/Src/HexMergeFrm.cpp b/Src/HexMergeFrm.cpp
index 0e42dcf2e..b493962d2 100644
--- a/Src/HexMergeFrm.cpp
+++ b/Src/HexMergeFrm.cpp
@@ -227,7 +227,7 @@ void CHexMergeFrame::GetMessageString(UINT nID, CString& rMessage) const
 {
 	// load appropriate string
 	const String s = theApp.LoadString(nID);
-	if (!AfxExtractSubString(rMessage, &*s.begin(), 0))
+	if (!AfxExtractSubString(rMessage, s.c_str(), 0))
 	{
 		// not found
 		TRACE1("Warning: no message line prompt for ID 0x%04X.\n", nID);
diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index aa7832956..629c6ca56 100644
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1817,7 +1817,7 @@ void CMainFrame::GetMessageString(UINT nID, CString& rMessage) const
 	const String s = theApp.LoadString(nID);
 
 	// avoid dereference of empty strings
-	if (s.length() <= 0 || !AfxExtractSubString(rMessage, &*s.begin(), 0))
+	if (s.length() <= 0 || !AfxExtractSubString(rMessage, s.c_str(), 0))
 	{
 		// not found
 		TRACE1("Warning: no message line prompt for ID 0x%04X.\n", nID);
diff --git a/Src/OpenFrm.cpp b/Src/OpenFrm.cpp
index 907a0b1d4..769acea3a 100644
--- a/Src/OpenFrm.cpp
+++ b/Src/OpenFrm.cpp
@@ -140,7 +140,7 @@ void COpenFrame::GetMessageString(UINT nID, CString& rMessage) const
 {
 	// load appropriate string
 	const String s = theApp.LoadString(nID);
-	if (!AfxExtractSubString(rMessage, &*s.begin(), 0))
+	if (!AfxExtractSubString(rMessage, s.c_str(), 0))
 	{
 		// not found
 		TRACE1("Warning: no message line prompt for ID 0x%04X.\n", nID);
-- 
2.11.0