commit 0dc5b98376f21e02aa7912caf571cb05b602e682
author Lei Zhang <thestig@chromium.org> Wed Jul 17 17:13:51 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 17 17:13:51 2024 +0000
tree 59706fa1f389627da296f6c5d3fc132f0212f8ca
parent 5e62cb644a9a2376c31d30781e428de55b14faa6

CHECK() two CPDF_DocRenderData methods receive non-null arguments

Add comment in the header to mention GetCachedType3() and
GetTransferFunc() require non-null arguments. Add CHECK() to enforce
this. No further action is needed, as these 2 methods only have a single
caller each. One can inspect the callers and see they indeed always pass
in non-null arguments.

Along the way, rename variables to use the preferred Google C++ style.

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

core/fpdfapi/render/cpdf_docrenderdata.cpp

diff --git a/core/fpdfapi/render/cpdf_docrenderdata.cpp b/core/fpdfapi/render/cpdf_docrenderdata.cpp
index 884b7fc..d3b6a95 100644
--- a/core/fpdfapi/render/cpdf_docrenderdata.cpp
+++ b/core/fpdfapi/render/cpdf_docrenderdata.cpp
@@ -44,28 +44,28 @@
 CPDF_DocRenderData::~CPDF_DocRenderData() = default;
 
 RetainPtr<CPDF_Type3Cache> CPDF_DocRenderData::GetCachedType3(
-    CPDF_Type3Font* pFont) {
-  auto it = m_Type3FaceMap.find(pFont);
+    CPDF_Type3Font* font) {
+  CHECK(font);
+  auto it = m_Type3FaceMap.find(font);
   if (it != m_Type3FaceMap.end() && it->second)
     return pdfium::WrapRetain(it->second.Get());
 
-  auto pCache = pdfium::MakeRetain<CPDF_Type3Cache>(pFont);
-  m_Type3FaceMap[pFont].Reset(pCache.Get());
-  return pCache;
+  auto cache = pdfium::MakeRetain<CPDF_Type3Cache>(font);
+  m_Type3FaceMap[font].Reset(cache.Get());
+  return cache;
 }
 
 RetainPtr<CPDF_TransferFunc> CPDF_DocRenderData::GetTransferFunc(
-    RetainPtr<const CPDF_Object> pObj) {
-  if (!pObj)
-    return nullptr;
-
-  auto it = m_TransferFuncMap.find(pObj);
-  if (it != m_TransferFuncMap.end() && it->second)
+    RetainPtr<const CPDF_Object> obj) {
+  CHECK(obj);
+  auto it = m_TransferFuncMap.find(obj);
+  if (it != m_TransferFuncMap.end() && it->second) {
     return pdfium::WrapRetain(it->second.Get());
+  }
 
-  auto pFunc = CreateTransferFunc(pObj);
-  m_TransferFuncMap[pObj].Reset(pFunc.Get());
-  return pFunc;
+  auto func = CreateTransferFunc(obj);
+  m_TransferFuncMap[obj].Reset(func.Get());
+  return func;
 }
 
 #if BUILDFLAG(IS_WIN)

core/fpdfapi/render/cpdf_docrenderdata.h

diff --git a/core/fpdfapi/render/cpdf_docrenderdata.h b/core/fpdfapi/render/cpdf_docrenderdata.h
index 1208931..1c5fbda 100644
--- a/core/fpdfapi/render/cpdf_docrenderdata.h
+++ b/core/fpdfapi/render/cpdf_docrenderdata.h
@@ -39,9 +39,10 @@
   CPDF_DocRenderData(const CPDF_DocRenderData&) = delete;
   CPDF_DocRenderData& operator=(const CPDF_DocRenderData&) = delete;
 
-  RetainPtr<CPDF_Type3Cache> GetCachedType3(CPDF_Type3Font* pFont);
+  // The argument to these methods must be non-null.
+  RetainPtr<CPDF_Type3Cache> GetCachedType3(CPDF_Type3Font* font);
   RetainPtr<CPDF_TransferFunc> GetTransferFunc(
-      RetainPtr<const CPDF_Object> pObj);
+      RetainPtr<const CPDF_Object> obj);
 
 #if BUILDFLAG(IS_WIN)
   CFX_PSFontTracker* GetPSFontTracker();