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 /core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp | |
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 'core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp index 47ba46a0f3..059dd4c2a6 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp @@ -83,9 +83,7 @@ CPDF_StreamContentParser::~CPDF_StreamContentParser() { for (int i = 0; i < m_StateStack.GetSize(); ++i) { delete (CPDF_AllStates*)m_StateStack[i]; } - if (m_pPathPoints) { - FX_Free(m_pPathPoints); - } + FX_Free(m_pPathPoints); if (m_pLastImageDict) { m_pLastImageDict->Release(); } @@ -1087,9 +1085,7 @@ void CPDF_StreamContentParser::Handle_SetColorPS_Fill() { } else { m_pCurStates->m_ColorState.SetFillColor(NULL, values, nvalues); } - if (values) { - FX_Free(values); - } + FX_Free(values); } void CPDF_StreamContentParser::Handle_SetColorPS_Stroke() { if (m_Options.m_bTextOnly) { @@ -1119,9 +1115,7 @@ void CPDF_StreamContentParser::Handle_SetColorPS_Stroke() { } else { m_pCurStates->m_ColorState.SetStrokeColor(NULL, values, nvalues); } - if (values) { - FX_Free(values); - } + FX_Free(values); } CFX_FloatRect _GetShadingBBox(CPDF_Stream* pStream, int type, |