Make down-conversion explicit from CFX_ByteString to CFX_ByteStringC.

Having this happen implicitly can be dangerous because the lifetime
has to be considered; we should have caught the "red bots" in
https://codereview.chromium.org/1847333004/#ps60001 at compile time.

Review URL: https://codereview.chromium.org/1853233002

1 files changed, 4 insertions, 4 deletions

diff --git a/fpdfsdk/fsdk_baseform.cpp b/fpdfsdk/fsdk_baseform.cpp
index be92b4a7e2..d195d87fc1 100644
--- a/fpdfsdk/fsdk_baseform.cpp
+++ b/fpdfsdk/fsdk_baseform.cpp
@@ -466,7 +466,7 @@ FX_BOOL CPDFSDK_Widget::IsWidgetAppearanceValid(
     case FIELDTYPE_CHECKBOX:
     case FIELDTYPE_RADIOBUTTON:
       if (CPDF_Dictionary* pSubDict = psub->AsDictionary()) {
-        return pSubDict->GetStreamBy(GetAppState()) != NULL;
+        return !!pSubDict->GetStreamBy(GetAppState().AsByteStringC());
       }
       return FALSE;
   }
@@ -1813,7 +1813,7 @@ void CPDFSDK_Widget::AddImageToAppearance(const CFX_ByteString& sAPType,
   ASSERT(pDoc);
 
   CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDictBy("AP");
-  CPDF_Stream* pStream = pAPDict->GetStreamBy(sAPType);
+  CPDF_Stream* pStream = pAPDict->GetStreamBy(sAPType.AsByteStringC());
   CPDF_Dictionary* pStreamDict = pStream->GetDict();
   CFX_ByteString sImageAlias = "IMG";
 
@@ -1831,14 +1831,14 @@ void CPDFSDK_Widget::AddImageToAppearance(const CFX_ByteString& sAPType,
 
   if (pStreamResList) {
     CPDF_Dictionary* pXObject = new CPDF_Dictionary;
-    pXObject->SetAtReference(sImageAlias, pDoc, pImage);
+    pXObject->SetAtReference(sImageAlias.AsByteStringC(), pDoc, pImage);
     pStreamResList->SetAt("XObject", pXObject);
   }
 }
 
 void CPDFSDK_Widget::RemoveAppearance(const CFX_ByteString& sAPType) {
   if (CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDictBy("AP")) {
-    pAPDict->RemoveAt(sAPType);
+    pAPDict->RemoveAt(sAPType.AsByteStringC());
   }
 }