Index: src/libchcore/TString.cpp
===================================================================
diff -u -N -r30297d6aab17483da8e7b8323b4d17ff1a9f78d6 -rb7655a8f0721e5454befd29e3e067748eb0521e9
--- src/libchcore/TString.cpp	(.../TString.cpp)	(revision 30297d6aab17483da8e7b8323b4d17ff1a9f78d6)
+++ src/libchcore/TString.cpp	(.../TString.cpp)	(revision b7655a8f0721e5454befd29e3e067748eb0521e9)
@@ -475,7 +475,7 @@
 
 	EnsureWritable(stLen);
 
-	const wchar_t* pszElementsEnd = pszElements + stLen;
+	const wchar_t* pszElementsEnd = pszElements + wcslen(pszElements);
 	while(stLen -- > 0)
 	{
 		if(std::find(pszElements, pszElementsEnd, m_pszStringData[stLen]) != pszElementsEnd)