Fix off-by-one in sizing of m_EmbeddedToUnicodes.

core/src/fpdfapi/fpdf_font/fpdf_font_cid.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/fpdfapi/fpdf_module.h"
 #include "../../../include/fpdfapi/fpdf_page.h"
 #include "font_int.h"
 #include "../fpdf_cmaps/cmap_int.h"
@@ skipping 58 matching lines @@
 CPDF_CMap* CPDF_CMapManager::LoadPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPromptCJK)
 {
     CPDF_CMap* pCMap = FX_NEW CPDF_CMap;
     FX_LPCSTR pname = name;
     if (*pname == '/') {
         pname ++;
     }
     pCMap->LoadPredefined(this, pname, bPromptCJK);
     return pCMap;
 }
-const FX_LPCSTR g_CharsetNames[] = {NULL, "GB1", "CNS1", "Japan1", "Korea1", "UCS", NULL};
-const int g_CharsetCPs[] = {0, 936, 950, 932, 949, 1200, 0};
+static const FX_LPCSTR g_CharsetNames[NUMBER_OF_CIDSETS] = {NULL, "GB1", "CNS1", "Japan1", "Korea1", "UCS" };
+static const int g_CharsetCPs[NUMBER_OF_CIDSETS] = {0, 936, 950, 932, 949, 1200 };
 int _CharsetFromOrdering(const CFX_ByteString& Ordering)
 {
-    int charset = 1;
-    while (g_CharsetNames[charset] && Ordering != CFX_ByteStringC(g_CharsetNames[charset])) {
-        charset ++;
-    }
-    if (g_CharsetNames[charset] == NULL) {
-        return CIDSET_UNKNOWN;
-    }
-    return charset;
+        for (int charset = 1; charset < NUMBER_OF_CIDSETS; charset++) {
+                if (Ordering == CFX_ByteStringC(g_CharsetNames[charset]))
+                        return charset;
+        }
+        return CIDSET_UNKNOWN;
 }
 void CPDF_CMapManager::ReloadAll()
 {
     DropAll(TRUE);
 }
 void CPDF_CMapManager::DropAll(FX_BOOL bReload)
 {
     FX_POSITION pos = m_CMaps.GetStartPosition();
     while (pos) {
         CFX_ByteString name;
@@ skipping 1601 matching lines @@
         if (middlecode > CID) {
             end = middle - 1;
         } else if (middlecode < CID) {
             begin = middle + 1;
         } else {
             return &Japan1_VertCIDs[middle].a;
         }
     }
     return NULL;
 }