commit dd427007f2c44b10752e7ee3101c9785f1e46c15
author weili <weili@chromium.org> Tue May 17 09:33:34 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue May 17 09:33:34 2016 -0700
tree c3eaa310416366a666f885d7d40c6e3caa9aeda0
parent 849284d54b5caeaf662d5890dbab5a6384598613

Revert of Remove an unnecessary variable from CPDF_Creator (patchset #1 id:20001 of https://codereview.chromium.org/1988603002/ )

Reason for revert:
The variable is still needed, will fix the other way.

Original issue's description:
> Remove an unnecessary variable from CPDF_Creator
>
> The variable may not be initialized before using, which caused
> errors on DrMemory bot. Since it is not necessary, remove it.
>
> TBR=thestig@chromium.org
>
> Committed: https://pdfium.googlesource.com/pdfium/+/47b998b53edbb071bb55c909169be1070126fb22

TBR=dsinclair@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.chromium.org/1987783002

core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp

diff --git a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
index 7604c62..372506d 100644
--- a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
+++ b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
@@ -881,10 +881,8 @@
       m_bSecurityChanged(FALSE),
       m_pEncryptDict(m_pParser ? m_pParser->GetEncryptDict() : nullptr),
       m_dwEncryptObjNum(0),
-      m_bEncryptCloned(FALSE),
       m_pCryptoHandler(m_pParser ? m_pParser->GetCryptoHandler() : nullptr),
       m_pMetadata(nullptr),
-      m_pXRefStream(nullptr),
       m_ObjectStreamSize(200),
       m_dwLastObjNum(m_pDocument->GetLastObjNum()),
       m_Offset(0),
@@ -1961,9 +1959,11 @@
       CPDF_SecurityHandler handler;
       handler.OnCreate(m_pEncryptDict, m_pIDArray, user_pass.raw_str(),
                        user_pass.GetLength(), flag);
-      delete m_pCryptoHandler;
+      if (m_bLocalCryptoHandler)
+        delete m_pCryptoHandler;
       m_pCryptoHandler = new CPDF_CryptoHandler;
       m_pCryptoHandler->Init(m_pEncryptDict, &handler);
+      m_bLocalCryptoHandler = TRUE;
       m_bSecurityChanged = TRUE;
     }
   }
@@ -2008,6 +2008,10 @@
   m_pCryptoHandler = nullptr;
 }
 void CPDF_Creator::ResetStandardSecurity() {
+  if (!m_bLocalCryptoHandler)
+    return;
+
   delete m_pCryptoHandler;
   m_pCryptoHandler = nullptr;
+  m_bLocalCryptoHandler = FALSE;
 }

core/fpdfapi/fpdf_edit/include/cpdf_creator.h

diff --git a/core/fpdfapi/fpdf_edit/include/cpdf_creator.h b/core/fpdfapi/fpdf_edit/include/cpdf_creator.h
index c63c864..c932dc0 100644
--- a/core/fpdfapi/fpdf_edit/include/cpdf_creator.h
+++ b/core/fpdfapi/fpdf_edit/include/cpdf_creator.h
@@ -80,6 +80,7 @@
   uint32_t m_dwEncryptObjNum;
   FX_BOOL m_bEncryptCloned;
   CPDF_CryptoHandler* m_pCryptoHandler;
+  FX_BOOL m_bLocalCryptoHandler;
   CPDF_Object* m_pMetadata;
   std::unique_ptr<CPDF_XRefStream> m_pXRefStream;
   int32_t m_ObjectStreamSize;