commit e8ddbcfcc84856a3cb017b13c59f31c0b10f9238
author Lei Zhang <thestig@chromium.org> Tue Jul 28 01:30:02 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Jul 28 01:30:02 2020 +0000
tree abee1b3017424624fe1031ffd1d6e45fc36fbd80
parent 6ab8d427c9a47b6ada7d3c716e38d106a7101493

Fix some nits in CPDF_CIDFont.

- Use more consts and early returns in Load().
- Don't declare variables inside if statements.

Change-Id: Ida01ae3e9975a0a0a2b39659f9d6de907adbb7d4
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/71912
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfapi/font/cpdf_cidfont.cpp

diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp
index 3bbefc4..59326c7 100644
--- a/core/fpdfapi/font/cpdf_cidfont.cpp
+++ b/core/fpdfapi/font/cpdf_cidfont.cpp
@@ -346,24 +346,27 @@
     m_bAdobeCourierStd = true;
   }
 
-  CPDF_Object* pEncoding = m_pFontDict->GetDirectObjectFor("Encoding");
+  const CPDF_Object* pEncoding = m_pFontDict->GetDirectObjectFor("Encoding");
   if (!pEncoding)
     return false;
 
   ByteString subtype = pCIDFontDict->GetStringFor("Subtype");
   m_bType1 = (subtype == "CIDFontType0");
 
+  if (!pEncoding->IsName() && !pEncoding->IsStream())
+    return false;
+
   CPDF_CMapManager* manager = CPDF_FontGlobals::GetInstance()->GetCMapManager();
-  if (pEncoding->IsName()) {
-    ByteString cmap = pEncoding->GetString();
-    m_pCMap = manager->GetPredefinedCMap(cmap);
-  } else if (CPDF_Stream* pStream = pEncoding->AsStream()) {
-    auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pStream);
+  const CPDF_Stream* pEncodingStream = pEncoding->AsStream();
+  if (pEncodingStream) {
+    auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pEncodingStream);
     pAcc->LoadAllDataFiltered();
     pdfium::span<const uint8_t> span = pAcc->GetSpan();
     m_pCMap = pdfium::MakeRetain<CPDF_CMap>(span);
   } else {
-    return false;
+    ASSERT(pEncoding->IsName());
+    ByteString cmap = pEncoding->GetString();
+    m_pCMap = manager->GetPredefinedCMap(cmap);
   }
 
   const CPDF_Dictionary* pFontDesc = pCIDFontDict->GetDictFor("FontDescriptor");
@@ -396,8 +399,9 @@
 
   const CPDF_Object* pmap = pCIDFontDict->GetDirectObjectFor("CIDToGIDMap");
   if (pmap) {
-    if (const CPDF_Stream* pStream = pmap->AsStream()) {
-      m_pStreamAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pStream);
+    const CPDF_Stream* pMapStream = pmap->AsStream();
+    if (pMapStream) {
+      m_pStreamAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pMapStream);
       m_pStreamAcc->LoadAllDataFiltered();
     } else if (m_pFontFile && pmap->GetString() == "Identity") {
       m_bCIDIsGID = true;
@@ -772,7 +776,8 @@
     if (!pObj)
       continue;
 
-    if (const CPDF_Array* pObjArray = pObj->AsArray()) {
+    const CPDF_Array* pObjArray = pObj->AsArray();
+    if (pObjArray) {
       if (width_status != 1)
         return;
       if (first_code >