Revert of Remove an unnecessary variable from CPDF_Creator

core/fpdfapi/fpdf_edit/fpdf_edit_create.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_edit/editint.h"
 
 #include <vector>
 
@@ skipping 863 matching lines @@
   else
     m_IndexArray.push_back({objnum, 1});
 }
 
 CPDF_Creator::CPDF_Creator(CPDF_Document* pDoc)
     : m_pDocument(pDoc),
       m_pParser(pDoc->GetParser()),
       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),
       m_iStage(-1),
       m_dwFlags(0),
       m_Pos(nullptr),
       m_XrefStart(0),
       m_pIDArray(nullptr),
       m_FileVersion(0) {}
 
@@ skipping 1056 matching lines @@
   }
   m_pIDArray->Add(m_pIDArray->GetObjectAt(0)->Clone());
   if (m_pEncryptDict && !pOldIDArray && m_pParser && bNewId) {
     if (m_pEncryptDict->GetStringBy("Filter") == "Standard") {
       CFX_ByteString user_pass = m_pParser->GetPassword();
       uint32_t flag = PDF_ENCRYPT_CONTENT;
 
       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;
     }
   }
 }
 int32_t CPDF_Creator::Continue(IFX_Pause* pPause) {
   if (m_iStage < 0) {
     return m_iStage;
   }
   int32_t iRet = 0;
   while (m_iStage < 100) {
@@ skipping 24 matching lines @@
   m_FileVersion = fileVersion;
   return TRUE;
 }
 void CPDF_Creator::RemoveSecurity() {
   ResetStandardSecurity();
   m_bSecurityChanged = TRUE;
   m_pEncryptDict = nullptr;
   m_pCryptoHandler = nullptr;
 }
 void CPDF_Creator::ResetStandardSecurity() {
+  if (!m_bLocalCryptoHandler)
+    return;
+
   delete m_pCryptoHandler;
   m_pCryptoHandler = nullptr;
+  m_bLocalCryptoHandler = FALSE;
 }