diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-08-14 22:22:13 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-08-14 22:22:13 -0700 |
| commit | da180e9fdd4385df024cc18046f62ca47bc74d74 (patch) | |
| tree | 931e0e64ac2cbc82e3718e43418ee6bd676da4a5 /fpdfsdk/src | |
| parent | 2b1a2d528469cda4e9f3e36d3c7a649e0d476480 (diff) | |
| download | pdfium-da180e9fdd4385df024cc18046f62ca47bc74d74.tar.xz | |
Merge to XFA: Don't bother checking pointers before delete[] and FX_Free().
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1297713003 .
(cherry picked from commit cb62e7657b3a9a04142028a4e6614029a08e894b)
Review URL: https://codereview.chromium.org/1287053005 .
Diffstat (limited to 'fpdfsdk/src')
| -rw-r--r-- | fpdfsdk/src/fsdk_actionhandler.cpp | 3 | ||||
| -rw-r--r-- | fpdfsdk/src/fsdk_baseform.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fpdfsdk/src/fsdk_actionhandler.cpp b/fpdfsdk/src/fsdk_actionhandler.cpp index c72bdfd79b..89b93eff01 100644 --- a/fpdfsdk/src/fsdk_actionhandler.cpp +++ b/fpdfsdk/src/fsdk_actionhandler.cpp @@ -535,8 +535,7 @@ void CPDFSDK_ActionHandler::DoAction_GoTo(CPDFSDK_Document* pDocument, sizeOfAry = j; } pApp->FFI_DoGoToAction(nPageIndex, nFitType, pPosAry, sizeOfAry); - if (pPosAry) - delete[] pPosAry; + delete[] pPosAry; } void CPDFSDK_ActionHandler::DoAction_GoToR(CPDFSDK_Document* pDocument, diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index b153ceb9d4..0cacbd8c4b 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -2885,7 +2885,7 @@ FX_BOOL CPDFSDK_InterForm::SubmitForm(const CFX_WideString& sDestination, pEnv->JS_docSubmitForm(pBuffer, nBufSize, sDestination.c_str()); - if (bUrlEncoded && pBuffer) { + if (bUrlEncoded) { FX_Free(pBuffer); pBuffer = NULL; } |