core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp - Issue 1297713003: Don't bother checking pointers before delete[] and FX_Free().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

Issue 1297713003: Don't bother checking pointers before delete[] and FX_Free(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp ('K') | « core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp ('k') | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

index 3830ad68a3b34cc8bbedbf508dcd1f73f4575089..397c4ea0839e1a61dd2e38015e8ee7937bc59594 100644

--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

@@ -828,7 +828,7 @@ CPDF_Stream::CPDF_Stream(uint8_t* pData, FX_DWORD size, CPDF_Dictionary* pDict)

m_pCryptoHandler = NULL;

}

CPDF_Stream::~CPDF_Stream() {

- if (m_GenNum == (FX_DWORD)-1 && m_pDataBuf != NULL) {

+ if (m_GenNum == (FX_DWORD)-1) {

FX_Free(m_pDataBuf);

}

if (m_pDict) {

@@ -843,9 +843,7 @@ void CPDF_Stream::InitStream(CPDF_Dictionary* pDict) {

m_pDict = pDict;

}

if (m_GenNum == (FX_DWORD)-1) {

- if (m_pDataBuf) {

FX_Free(m_pDataBuf);

- }

}

m_GenNum = 0;

m_pFile = NULL;

@@ -871,9 +869,7 @@ void CPDF_Stream::SetData(const uint8_t* pData,

FX_BOOL bCompressed,

FX_BOOL bKeepBuf) {

if (m_GenNum == (FX_DWORD)-1) {

- if (m_pDataBuf) {

FX_Free(m_pDataBuf);

- }

} else {

m_GenNum = (FX_DWORD)-1;

m_pCryptoHandler = NULL;

@@ -1070,12 +1066,10 @@ void CPDF_StreamAcc::LoadAllData(const CPDF_Stream* pStream,

m_bNewBuf = m_pData != pStream->m_pDataBuf;

}

CPDF_StreamAcc::~CPDF_StreamAcc() {

- if (m_bNewBuf && m_pData) {

+ if (m_bNewBuf) {

FX_Free(m_pData);

}

- if (m_pSrcData) {

FX_Free(m_pSrcData);

- }

}

const uint8_t* CPDF_StreamAcc::GetData() const {

if (m_bNewBuf) {