Fix more bugs found by /analyze tool

core/fpdfapi/fpdf_parser/cpdf_stream_acc.cpp

Index: core/fpdfapi/fpdf_parser/cpdf_stream_acc.cpp
diff --git a/core/fpdfapi/fpdf_parser/cpdf_stream_acc.cpp b/core/fpdfapi/fpdf_parser/cpdf_stream_acc.cpp
index afac3ebf6f10b0758b17e4fef0d3fc4df5c2a0b7..ed6221b7d3968de4ce60ad798addefcd8eb4feca 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_stream_acc.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_stream_acc.cpp
@@ -56,40 +56,31 @@ void CPDF_StreamAcc::LoadAllData(const CPDF_Stream* pStream,
       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();
 }