Remove Release() from IFXCRT_FileAccess

core/fxcrt/fx_extension.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/fxcrt/extension.h"
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_ext.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #include <wincrypt.h>
 #else
 #include <ctime>
 #endif
 
 CFX_CRTFileStream::CFX_CRTFileStream(IFXCRT_FileAccess* pFA)
     : m_pFile(pFA), m_dwCount(1) {}
 
-CFX_CRTFileStream::~CFX_CRTFileStream() {
-  if (m_pFile) {
-    m_pFile->Release();
-  }
-}
+CFX_CRTFileStream::~CFX_CRTFileStream() {}
 
 IFX_FileStream* CFX_CRTFileStream::Retain() {
   m_dwCount++;
   return this;
 }
 
 void CFX_CRTFileStream::Release() {
   uint32_t nCount = --m_dwCount;
   if (!nCount) {
     delete this;
@@ skipping 41 matching lines @@
   pFA = new CFX_CRTFileAccess;
   if (NULL == pFA)
     return NULL;
 
   pFA->Init(wsPath);
   return pFA;
 }
 #endif  // PDF_ENABLE_XFA
 
 IFX_FileStream* FX_CreateFileStream(const FX_CHAR* filename, uint32_t dwModes) {
-  IFXCRT_FileAccess* pFA = FXCRT_FileAccess_Create();
-  if (!pFA) {
-    return NULL;
-  }
-  if (!pFA->Open(filename, dwModes)) {
-    pFA->Release();
-    return NULL;
-  }
-  return new CFX_CRTFileStream(pFA);
+  std::unique_ptr<IFXCRT_FileAccess> pFA(IFXCRT_FileAccess::Create());
+  if (!pFA)

[Lei Zhang, 2016/05/19 22:50:05]

IFXCRT_FileAccess::Create() can't fail.

[Tom Sepez, 2016/05/19 23:18:31]

Done.

+    return nullptr;
+  if (!pFA->Open(filename, dwModes))
+    return nullptr;
+  return new CFX_CRTFileStream(pFA.release());

[Lei Zhang, 2016/05/19 22:50:05]

CFX_CRTFileStream should take a unique_ptr. The only 2 callers are here and
below according to Code Search.

[Tom Sepez, 2016/05/19 23:18:31]

Done.

 }
+
 IFX_FileStream* FX_CreateFileStream(const FX_WCHAR* filename,
                                     uint32_t dwModes) {
-  IFXCRT_FileAccess* pFA = FXCRT_FileAccess_Create();
-  if (!pFA) {
-    return NULL;
-  }
-  if (!pFA->Open(filename, dwModes)) {
-    pFA->Release();
-    return NULL;
-  }
-  return new CFX_CRTFileStream(pFA);
+  std::unique_ptr<IFXCRT_FileAccess> pFA(IFXCRT_FileAccess::Create());
+  if (!pFA)
+    return nullptr;
+  if (!pFA->Open(filename, dwModes))
+    return nullptr;
+  return new CFX_CRTFileStream(pFA.release());
 }
 IFX_FileRead* FX_CreateFileRead(const FX_CHAR* filename) {
   return FX_CreateFileStream(filename, FX_FILEMODE_ReadOnly);
 }
 IFX_FileRead* FX_CreateFileRead(const FX_WCHAR* filename) {
   return FX_CreateFileStream(filename, FX_FILEMODE_ReadOnly);
 }
 IFX_MemoryStream* FX_CreateMemoryStream(uint8_t* pBuffer,
                                         size_t dwSize,
                                         FX_BOOL bTakeOver) {
@@ skipping 246 matching lines @@
     b = ((const uint8_t*)pGUID)[i];
     *pBuf++ = gs_FX_pHexChars[b >> 4];
     *pBuf++ = gs_FX_pHexChars[b & 0x0F];
     if (bSeparator && (i == 3 || i == 5 || i == 7 || i == 9)) {
       *pBuf++ = L'-';
     }
   }
   bsStr.ReleaseBuffer(bSeparator ? 36 : 32);
 }
 #endif  // PDF_ENABLE_XFA