diff options
author | Lei Zhang <thestig@chromium.org> | 2015-07-16 18:45:22 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-07-16 18:45:22 -0700 |
commit | 796c908e7b7bdde819a1e5a4bfd3576d8e8859d6 (patch) | |
tree | 8c0cd763dd9bf70bc14da8f8cb7893835a3572fe /fpdfsdk/src/javascript | |
parent | ba026913c273a5c1c841bced288fdab03f10ad08 (diff) | |
download | pdfium-796c908e7b7bdde819a1e5a4bfd3576d8e8859d6.tar.xz |
Merge to XFA: Cleanup: Do not check pointers before deleting them, part 2.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1195363002 .
(cherry picked from commit 21bf242a31eff79f754c5e9c3b41c52e33483bb0)
Review URL: https://codereview.chromium.org/1235753006 .
Diffstat (limited to 'fpdfsdk/src/javascript')
-rw-r--r-- | fpdfsdk/src/javascript/JS_Context.cpp | 6 | ||||
-rw-r--r-- | fpdfsdk/src/javascript/JS_Runtime.cpp | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp index f41cf9ec13..e789657469 100644 --- a/fpdfsdk/src/javascript/JS_Context.cpp +++ b/fpdfsdk/src/javascript/JS_Context.cpp @@ -24,11 +24,7 @@ CJS_Context::CJS_Context(CJS_Runtime* pRuntime) : CJS_Context::~CJS_Context(void) { - if (m_pEventHandler) - { - delete m_pEventHandler; - m_pEventHandler = NULL; - } + delete m_pEventHandler; } CPDFSDK_Document* CJS_Context::GetReaderDocument() diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index 2ffc9ff988..bfea274eed 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -63,8 +63,7 @@ void CJS_RuntimeFactory::Release() void CJS_RuntimeFactory::DeleteJSRuntime(IFXJS_Runtime* pRuntime) { - if(pRuntime) - delete (CJS_Runtime*)pRuntime; + delete (CJS_Runtime*)pRuntime; } CJS_GlobalData* CJS_RuntimeFactory::NewGlobalData(CPDFDoc_Environment* pApp) |