Do not check pointers before deleting them.

xfa/fxbarcode/BC_BufferedImageLuminanceSource.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
 // Original code is licensed as follows:
 /*
  * Copyright 2009 ZXing authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
+#include <memory>
+
 #include "core/fxcodec/codec/include/ccodec_progressivedecoder.h"
 #include "core/fxcodec/include/fx_codec.h"
 #include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
 #include "xfa/fxbarcode/BC_LuminanceSource.h"
 #include "xfa/fxbarcode/utils.h"
 
 class CBC_Pause : public IFX_Pause {
  public:
   virtual FX_BOOL NeedToPauseNow() { return TRUE; }
 };
 
 static CFX_DIBitmap* CreateDIBSource(IFX_FileRead* fileread) {
-  CFX_DIBitmap* bitmap = nullptr;
-  CCodec_ModuleMgr* pCodecMgr = nullptr;
-  CCodec_ProgressiveDecoder* pImageCodec = nullptr;
-  pCodecMgr = new CCodec_ModuleMgr();
-  pImageCodec = pCodecMgr->CreateProgressiveDecoder();
+  std::unique_ptr<CCodec_ModuleMgr> pCodecMgr(new CCodec_ModuleMgr());
+  std::unique_ptr<CCodec_ProgressiveDecoder> pImageCodec(
+      pCodecMgr->CreateProgressiveDecoder());
   FXCODEC_STATUS status = FXCODEC_STATUS_DECODE_FINISH;
   status = pImageCodec->LoadImageInfo(fileread, FXCODEC_IMAGE_UNKNOWN, nullptr);
   if (status != FXCODEC_STATUS_FRAME_READY)
     return nullptr;
 
-  bitmap = new CFX_DIBitmap;
+  std::unique_ptr<CFX_DIBitmap> bitmap(new CFX_DIBitmap);
   bitmap->Create(pImageCodec->GetWidth(), pImageCodec->GetHeight(), FXDIB_Argb);
   bitmap->Clear(FXARGB_MAKE(0xFF, 0xFF, 0xFF, 0xFF));
   CBC_Pause pause;
   int32_t frames;
   status = pImageCodec->GetFrames(frames, &pause);
-  while (status == FXCODEC_STATUS_FRAME_TOBECONTINUE) {
+  while (status == FXCODEC_STATUS_FRAME_TOBECONTINUE)
     status = pImageCodec->GetFrames(frames, &pause);
+
+  if (status != FXCODEC_STATUS_DECODE_READY)
+    return nullptr;
+
+  status = pImageCodec->StartDecode(bitmap.get(), 0, 0, bitmap->GetWidth(),
+                                    bitmap->GetHeight(), 0, FALSE);
+  if (status == FXCODEC_STATUS_ERR_PARAMS ||

[Tom Sepez, 2016/04/28 21:47:22]

Doesn't the second part cover the first part?

[Lei Zhang, 2016/04/28 22:31:10]

Done.

+      status != FXCODEC_STATUS_DECODE_TOBECONTINUE) {
+    return nullptr;
   }
-  if (status != FXCODEC_STATUS_DECODE_READY) {
-    goto except;
-  }
-  status = pImageCodec->StartDecode(bitmap, 0, 0, bitmap->GetWidth(),
-                                    bitmap->GetHeight(), 0, FALSE);
-  if (status == FXCODEC_STATUS_ERR_PARAMS) {
-    goto except;
-  }
-  if (status != FXCODEC_STATUS_DECODE_TOBECONTINUE) {
-    goto except;
-  }
-  while (status == FXCODEC_STATUS_DECODE_TOBECONTINUE) {
+
+  while (status == FXCODEC_STATUS_DECODE_TOBECONTINUE)
     status = pImageCodec->ContinueDecode(&pause);
-  }
-  if (status != FXCODEC_STATUS_DECODE_FINISH) {
-    goto except;
-  }
-  if (pImageCodec) {
-    delete pImageCodec;
-    pImageCodec = nullptr;
-  }
-  delete pCodecMgr;
-  pCodecMgr = nullptr;
-  return bitmap;
-except:
-  if (pImageCodec) {
-    delete pImageCodec;
-    pImageCodec = nullptr;
-  }
-  delete pCodecMgr;
-  pCodecMgr = nullptr;
-  if (bitmap) {
-    delete bitmap;
-  }
-  return nullptr;
+
+  return status == FXCODEC_STATUS_DECODE_FINISH ? bitmap.release() : nullptr;
 }
 
 CBC_BufferedImageLuminanceSource::CBC_BufferedImageLuminanceSource(
     const CFX_WideString& filename)
     : CBC_LuminanceSource(0, 0), m_filename(filename) {
   m_height = 0;
   m_width = 0;
   m_bytesPerLine = 0;
   m_top = 0;
   m_left = 0;
@@ skipping 70 matching lines @@
       int32_t pixel = rgb[offset + x];
       int32_t luminance =
           (306 * ((pixel >> 16) & 0xFF) + 601 * ((pixel >> 8) & 0xFF) +
            117 * (pixel & 0xFF)) >>
           10;
       (*matirx)[offset + x] = (uint8_t)luminance;
     }
   }
   return matirx;
 }