Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2905)

Unified Diff: core/fpdfapi/page/fpdf_page_parser_old.cpp

Issue 2478253002: Revert of Remove CPDF_Object::Release() in favor of direct delete (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « core/fpdfapi/page/cpdf_streamcontentparser.cpp ('k') | core/fpdfapi/parser/cfdf_document.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fpdfapi/page/fpdf_page_parser_old.cpp
diff --git a/core/fpdfapi/page/fpdf_page_parser_old.cpp b/core/fpdfapi/page/fpdf_page_parser_old.cpp
index 51ffc11b03405a5c98b3ab39dffd923b6353d64a..0d1db43825d8535608c044c9569876a81b547bb8 100644
--- a/core/fpdfapi/page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/page/fpdf_page_parser_old.cpp
@@ -138,7 +138,9 @@
m_pPool(pPool) {}
CPDF_StreamParser::~CPDF_StreamParser() {
- delete m_pLastObj;
+ if (m_pLastObj) {
+ m_pLastObj->Release();
+ }
}
CPDF_Stream* CPDF_StreamParser::ReadInlineStream(CPDF_Document* pDoc,
@@ -250,8 +252,10 @@
}
CPDF_StreamParser::SyntaxType CPDF_StreamParser::ParseNextElement() {
- delete m_pLastObj;
- m_pLastObj = nullptr;
+ if (m_pLastObj) {
+ m_pLastObj->Release();
+ m_pLastObj = nullptr;
+ }
m_WordSize = 0;
bool bIsNumber = true;
@@ -370,7 +374,7 @@
break;
if (!m_WordSize || m_WordBuffer[0] != '/') {
- delete pDict;
+ pDict->Release();
return nullptr;
}
@@ -378,12 +382,12 @@
PDF_NameDecode(CFX_ByteStringC(m_WordBuffer + 1, m_WordSize - 1));
CPDF_Object* pObj = ReadNextObject(true, 0);
if (!pObj) {
- delete pDict;
+ pDict->Release();
return nullptr;
}
if (key.IsEmpty())
- delete pObj;
+ pObj->Release();
else
pDict->SetFor(key, pObj);
}
« no previous file with comments | « core/fpdfapi/page/cpdf_streamcontentparser.cpp ('k') | core/fpdfapi/parser/cfdf_document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698