BUG: [ 2538640 ] version.cpp

 string_trim_ws() crashes with empty string.

diff --git a/Src/Common/version.cpp b/Src/Common/version.cpp
index 2ddb0b8..fecc028 100644 (file)
--- 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();