Fix an out-of-boundary issue for wide string

core/src/fxge/win32/fx_win32_device.cpp

Index: core/src/fxge/win32/fx_win32_device.cpp
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp
index 2e2ea9a92b32635d53e24a3d94f1659f1882dabf..a01f3337eb8ba358b6b8d6c1a444ef71daaa2e52 100644
--- a/core/src/fxge/win32/fx_win32_device.cpp
+++ b/core/src/fxge/win32/fx_win32_device.cpp
@@ -328,7 +328,11 @@ void* CWin32FontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitc
     for (int i = 0; i < iCount; ++i) {
         if (face == VariantNames[i].m_pFaceName) {
             CFX_WideString wsFace = CFX_WideString::FromLocal(facebuf);
-            CFX_WideString wsName = CFX_WideString::FromUTF16LE((const unsigned short*)VariantNames[i].m_pVariantName);
+            const unsigned short* pName = (const unsigned short*)VariantNames[i].m_pVariantName;
+            FX_STRSIZE len = 0;
+            while (pName[len]) len++;

[palmer, 2014/07/12 00:54:39]

Use wcslen?

[Bo Xu, 2014/07/12 05:18:04]

Done.

+            CFX_WideString wsName = CFX_WideString::FromUTF16LE(pName, len);
+
             if (wsFace == wsName) {
                 return hFont;
             }