1 files changed, 5 insertions, 4 deletions
diff --git a/core/fpdfapi/cmaps/fpdf_cmaps.cpp b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
index bba8d2173d..bb4a397aa4 100644
--- a/core/fpdfapi/cmaps/fpdf_cmaps.cpp
+++ b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
@@ -11,6 +11,7 @@
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/font/cpdf_fontglobals.h"
 #include "core/fpdfapi/page/cpdf_pagemodule.h"
+#include "third_party/base/span.h"
 
 namespace {
 
@@ -26,10 +27,10 @@ const FXCMAP_CMap* FPDFAPI_FindEmbeddedCMap(const ByteString& bsName,
   CPDF_FontGlobals* pFontGlobals =
       CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals();
 
-  const FXCMAP_CMap* pCMaps;
-  uint32_t count;
-  std::tie(count, pCMaps) = pFontGlobals->GetEmbeddedCharset(charset);
-  for (uint32_t i = 0; i < count; i++) {
+  pdfium::span<const FXCMAP_CMap> pCMaps =
+      pFontGlobals->GetEmbeddedCharset(charset);
+
+  for (size_t i = 0; i < pCMaps.size(); i++) {
     if (bsName == pCMaps[i].m_Name)
       return &pCMaps[i];
   }