Fix an out-of-boundary issue for wide string

core/src/fxcrt/fx_basic_wstring.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fxcrt/fx_basic.h"
 #include "../../../third_party/numerics/safe_math.h"
 
 static CFX_StringDataW* FX_AllocStringW(int nLen)
@@ skipping 380 matching lines @@
     return m_pData->m_String;
 }
 CFX_WideString CFX_WideString::FromLocal(const char* str, FX_STRSIZE len)
 {
     CFX_WideString result;
     result.ConvertFrom(CFX_ByteString(str, len));
     return result;
 }
 CFX_WideString CFX_WideString::FromUTF8(const char* str, FX_STRSIZE len)
 {
     if (!str) {

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

You could say:

    if (!str || 0 == len)

to avoid the (infinitesimal) cost of constructing and calling CFX_UTF8Decoder.

Then this function would match the behavior on line 413.

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

Done.

         return CFX_WideString();
     }
-    if (len < 0) {
-        len = 0;
-        while (str[len]) {
-            len ++;
-        }
-    }
+
     CFX_UTF8Decoder decoder;
     for (FX_STRSIZE i = 0; i < len; i ++) {
         decoder.Input(str[i]);
     }
     return decoder.GetResult();
 }
 CFX_WideString CFX_WideString::FromUTF16LE(const unsigned short* wstr, FX_STRSIZE wlen)
 {
     if (!wstr || !wlen) {
         return CFX_WideString();
     }
-    if (wlen < 0) {
-        wlen = 0;
-        while (wstr[wlen]) {
-            wlen ++;
-        }
-    }
+
     CFX_WideString result;
     FX_WCHAR* buf = result.GetBuffer(wlen);
     for (int i = 0; i < wlen; i ++) {
         buf[i] = wstr[i];
     }
     result.ReleaseBuffer(wlen);
     return result;
 }
 void CFX_WideString::AllocCopy(CFX_WideString& dest, FX_STRSIZE nCopyLen, FX_STRSIZE nCopyIndex) const
 {
@@ skipping 683 matching lines @@
             return (CFX_CharMap*)&g_DefaultJISMapper;
         case 936:
             return (CFX_CharMap*)&g_DefaultGBKMapper;
         case 949:
             return (CFX_CharMap*)&g_DefaultUHCMapper;
         case 950:
             return (CFX_CharMap*)&g_DefaultBig5Mapper;
     }
     return NULL;
 }