Fix more bugs found by /analyze tool

core/fpdfapi/fpdf_parser/cpdf_stream_acc.cpp

 // Copyright 2016 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/include/cpdf_stream_acc.h"
 
 #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
 
@@ skipping 24 matching lines @@
   if (dwSrcSize == 0)
     return;
 
   if (!pStream->IsMemoryBased()) {
     pSrcData = m_pSrcData = FX_Alloc(uint8_t, dwSrcSize);
     if (!pStream->ReadRawData(0, pSrcData, dwSrcSize))
       return;
   } else {
     pSrcData = pStream->GetRawData();
   }
-  uint8_t* pDecryptedData = pSrcData;
-  uint32_t dwDecryptedSize = dwSrcSize;
   if (!pStream->GetDict()->KeyExist("Filter") || bRawAccess) {
-    m_pData = pDecryptedData;
-    m_dwSize = dwDecryptedSize;
+    m_pData = pSrcData;
+    m_dwSize = dwSrcSize;
   } else {
-    FX_BOOL bRet = PDF_DataDecode(
-        pDecryptedData, dwDecryptedSize, m_pStream->GetDict(), m_pData,
-        m_dwSize, m_ImageDecoder, m_pImageParam, estimated_size, bImageAcc);
+    FX_BOOL bRet = PDF_DataDecode(pSrcData, dwSrcSize, m_pStream->GetDict(),
+                                  m_pData, m_dwSize, m_ImageDecoder,
+                                  m_pImageParam, estimated_size, bImageAcc);
     if (!bRet) {
-      m_pData = pDecryptedData;
-      m_dwSize = dwDecryptedSize;
+      m_pData = pSrcData;
+      m_dwSize = dwSrcSize;
     }
   }
-  if (pSrcData != pStream->GetRawData() && pSrcData != m_pData) {
+  if (pSrcData != pStream->GetRawData() && pSrcData != m_pData)
     FX_Free(pSrcData);
-  }
-  if (pDecryptedData != pSrcData && pDecryptedData != m_pData) {
-    FX_Free(pDecryptedData);
-  }
   m_pSrcData = nullptr;
   m_bNewBuf = m_pData != pStream->GetRawData();
 }
 
 CPDF_StreamAcc::~CPDF_StreamAcc() {
-  if (m_bNewBuf) {
+  if (m_bNewBuf)
     FX_Free(m_pData);
-  }
   FX_Free(m_pSrcData);
 }
 
 const uint8_t* CPDF_StreamAcc::GetData() const {
-  if (m_bNewBuf) {
+  if (m_bNewBuf)
     return m_pData;
-  }
-  if (!m_pStream) {
-    return nullptr;
-  }
-  return m_pStream->GetRawData();
+  return m_pStream ? m_pStream->GetRawData() : nullptr;
 }
 
 uint32_t CPDF_StreamAcc::GetSize() const {
-  if (m_bNewBuf) {
+  if (m_bNewBuf)
     return m_dwSize;
-  }
-  if (!m_pStream) {
-    return 0;
-  }
-  return m_pStream->GetRawSize();
+  return m_pStream ? m_pStream->GetRawSize() : 0;
 }
 
 uint8_t* CPDF_StreamAcc::DetachData() {
   if (m_bNewBuf) {
     uint8_t* p = m_pData;
     m_pData = nullptr;
     m_dwSize = 0;
     return p;
   }
   uint8_t* p = FX_Alloc(uint8_t, m_dwSize);
   FXSYS_memcpy(p, m_pData, m_dwSize);
   return p;
 }