From: Kimmo Varis <kimmov@gmail.com>
Date: Mon, 26 Jan 2009 23:36:10 +0000 (+0000)
Subject: BUG: [ 2538640 ] version.cpp
X-Git-Tag: 2.16.5~2611
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=775e9d59446520eb10acb3dfe1fab435da5e3f01;p=winmerge-jp%2Fwinmerge-jp.git

BUG: [ 2538640 ] version.cpp
 string_trim_ws() crashes with empty string.
---

diff --git a/Src/Common/version.cpp b/Src/Common/version.cpp
index 2ddb0b85a..fecc02841 100644
--- a/Src/Common/version.cpp
+++ b/Src/Common/version.cpp
@@ -367,7 +367,7 @@ void CVersionInfo::QueryValue(LPCTSTR szId, String& s)
 	TCHAR szSelector[256];
 	_sntprintf(szSelector, countof(szSelector) - 1,
 			_T("\\StringFileInfo\\%s%s\\%s"),
-			m_strLanguage, m_strCodepage, szId);
+			m_strLanguage.c_str(), m_strCodepage.c_str(), szId);
 	bRetCode = VerQueryValue((LPVOID)m_pVffInfo,
 		szSelector,
 		(LPVOID *)&lpVersion,
@@ -376,7 +376,8 @@ void CVersionInfo::QueryValue(LPCTSTR szId, String& s)
 	if (bRetCode)
 	{
 		s = lpVersion;
-		s = string_trim_ws(s);
+		if (!s.empty())
+			s = string_trim_ws(s);
 	}
 	else
 		s.clear();