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/fxge/win32 | |
| 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/fxge/win32')
| -rw-r--r-- | core/src/fxge/win32/fx_win32_device.cpp | 4 | ||||
| -rw-r--r-- | core/src/fxge/win32/fx_win32_print.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index eca2b0440b..d5f29686c9 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -702,9 +702,7 @@ static HPEN _CreatePen(const CFX_GraphStateData* pGraphState, } HPEN hPen = ExtCreatePen(PenStyle, (DWORD)FXSYS_ceil(width), &lb, pGraphState->m_DashCount, (const DWORD*)pDash); - if (pDash) { - FX_Free(pDash); - } + FX_Free(pDash); return hPen; } static HBRUSH _CreateBrush(FX_DWORD argb) { diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp index aa8eefd1bb..de5b4c54be 100644 --- a/core/src/fxge/win32/fx_win32_print.cpp +++ b/core/src/fxge/win32/fx_win32_print.cpp @@ -289,9 +289,7 @@ CPSOutput::CPSOutput(HDC hDC) { m_pBuf = NULL; } CPSOutput::~CPSOutput() { - if (m_pBuf) { - FX_Free(m_pBuf); - } + FX_Free(m_pBuf); } void CPSOutput::Init() { m_pBuf = FX_Alloc(FX_CHAR, 1026); |