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 38 matching lines @@
     m_dwSize = dwDecryptedSize;
   } else {
     FX_BOOL bRet = PDF_DataDecode(
         pDecryptedData, dwDecryptedSize, m_pStream->GetDict(), m_pData,
         m_dwSize, m_ImageDecoder, m_pImageParam, estimated_size, bImageAcc);
     if (!bRet) {
       m_pData = pDecryptedData;
       m_dwSize = dwDecryptedSize;
     }
   }
-  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);

[Tom Sepez, 2016/06/03 18:54:37]

Why is OK to remove this?  We might leak.

[Wei Li, 2016/06/03 19:48:21]

pDecryptedData is always same as pre-freed pSrcData. Now removed pDecryptedData
to make it clearer.

-  }
   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) {
+  if (!m_pStream)

[Tom Sepez, 2016/06/03 18:54:37]

nit: maybe ? oper here instead.

[Wei Li, 2016/06/03 19:48:21]

Done.

     return nullptr;
-  }
   return m_pStream->GetRawData();
 }
 
 uint32_t CPDF_StreamAcc::GetSize() const {
-  if (m_bNewBuf) {
+  if (m_bNewBuf)
     return m_dwSize;
-  }
-  if (!m_pStream) {
+  if (!m_pStream)

[Tom Sepez, 2016/06/03 18:54:37]

ditto

[Wei Li, 2016/06/03 19:48:21]

Done.

     return 0;
-  }
   return m_pStream->GetRawSize();
 }
 
 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;
 }