Make CFX_ByteString(const CFX_ByteStringC&) explicit.

core/fpdfapi/fpdf_parser/cpdf_security_handler.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 "core/fpdfapi/fpdf_parser/cpdf_security_handler.h"
 
 #include <time.h>
 
@@ skipping 94 matching lines @@
       }
     }
     return TRUE;
   }
   return CheckPassword(password.raw_str(), password.GetLength(), FALSE,
                        m_EncryptKey, key_len);
 }
 uint32_t CPDF_SecurityHandler::GetPermissions() {
   return m_Permissions;
 }
-static FX_BOOL _LoadCryptInfo(CPDF_Dictionary* pEncryptDict,
-                              const CFX_ByteStringC& name,
-                              int& cipher,
-                              int& keylen) {
+
+static FX_BOOL LoadCryptInfo(CPDF_Dictionary* pEncryptDict,
+                             const CFX_ByteString& name,
+                             int& cipher,
+                             int& keylen) {
   int Version = pEncryptDict->GetIntegerBy("V");
   cipher = FXCIPHER_RC4;
   keylen = 0;
   if (Version >= 4) {
     CPDF_Dictionary* pCryptFilters = pEncryptDict->GetDictBy("CF");
     if (!pCryptFilters) {
       return FALSE;
     }
     if (name == "Identity") {
       cipher = FXCIPHER_NONE;
@@ skipping 27 matching lines @@
     return FALSE;
   }
   return TRUE;
 }
 
 FX_BOOL CPDF_SecurityHandler::LoadDict(CPDF_Dictionary* pEncryptDict) {
   m_pEncryptDict = pEncryptDict;
   m_Version = pEncryptDict->GetIntegerBy("V");
   m_Revision = pEncryptDict->GetIntegerBy("R");
   m_Permissions = pEncryptDict->GetIntegerBy("P", -1);
-  if (m_Version < 4) {
-    return _LoadCryptInfo(pEncryptDict, CFX_ByteStringC(), m_Cipher, m_KeyLen);
-  }
+  if (m_Version < 4)
+    return LoadCryptInfo(pEncryptDict, CFX_ByteString(), m_Cipher, m_KeyLen);
+
   CFX_ByteString stmf_name = pEncryptDict->GetStringBy("StmF");
   CFX_ByteString strf_name = pEncryptDict->GetStringBy("StrF");
-  if (stmf_name != strf_name) {
+  if (stmf_name != strf_name)
     return FALSE;
-  }
-  if (!_LoadCryptInfo(pEncryptDict, strf_name.AsStringC(), m_Cipher,
-                      m_KeyLen)) {
-    return FALSE;
-  }
-  return TRUE;
+
+  return LoadCryptInfo(pEncryptDict, strf_name, m_Cipher, m_KeyLen);
 }
 
 FX_BOOL CPDF_SecurityHandler::LoadDict(CPDF_Dictionary* pEncryptDict,
                                        uint32_t type,
                                        int& cipher,
                                        int& key_len) {
   m_pEncryptDict = pEncryptDict;
   m_Version = pEncryptDict->GetIntegerBy("V");
   m_Revision = pEncryptDict->GetIntegerBy("R");
   m_Permissions = pEncryptDict->GetIntegerBy("P", -1);
-  CFX_ByteString strf_name, stmf_name;
+
+  CFX_ByteString strf_name;
+  CFX_ByteString stmf_name;
   if (m_Version >= 4) {
     stmf_name = pEncryptDict->GetStringBy("StmF");
     strf_name = pEncryptDict->GetStringBy("StrF");
-    if (stmf_name != strf_name) {
+    if (stmf_name != strf_name)
       return FALSE;
-    }
   }
-  if (!_LoadCryptInfo(pEncryptDict, strf_name.AsStringC(), cipher, key_len)) {
+  if (!LoadCryptInfo(pEncryptDict, strf_name, cipher, key_len))
     return FALSE;
-  }
+
   m_Cipher = cipher;
   m_KeyLen = key_len;
   return TRUE;
 }
 
 FX_BOOL CPDF_SecurityHandler::GetCryptInfo(int& cipher,
                                            const uint8_t*& buffer,
                                            int& keylen) {
   cipher = m_Cipher;
   buffer = m_EncryptKey;
@@ skipping 488 matching lines @@
   buf[11] = 'b';
   uint8_t* aes = FX_Alloc(uint8_t, 2048);
   CRYPT_AESSetKey(aes, 16, key, 32, TRUE);
   uint8_t iv[16], buf1[16];
   FXSYS_memset(iv, 0, 16);
   CRYPT_AESSetIV(aes, iv);
   CRYPT_AESEncrypt(aes, buf1, buf, 16);
   FX_Free(aes);
   pEncryptDict->SetAtString("Perms", CFX_ByteString(buf1, 16));
 }