Index: core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp |
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp |
index 4f81be1d3f949551e1577642c30f963a51f25533..ff14a984bd011602cb504af059e56da0d0034f28 100644 |
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp |
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp |
@@ -4109,13 +4109,11 @@ FX_BOOL CPDF_DataAvail::CheckTrailer(IFX_DownloadHints* pHints) { |
return FALSE; |
} |
CPDF_Dictionary* pTrailerDict = pTrailer->GetDict(); |
Lei Zhang
2015/09/04 21:10:40
Check is right above on line 4107.
|
- if (pTrailerDict) { |
- CPDF_Object* pEncrypt = pTrailerDict->GetElement("Encrypt"); |
- if (pEncrypt && pEncrypt->GetType() == PDFOBJ_REFERENCE) { |
- m_docStatus = PDF_DATAAVAIL_LOADALLFILE; |
- pTrailer->Release(); |
- return TRUE; |
- } |
+ CPDF_Object* pEncrypt = pTrailerDict->GetElement("Encrypt"); |
+ if (pEncrypt && pEncrypt->GetType() == PDFOBJ_REFERENCE) { |
+ m_docStatus = PDF_DATAAVAIL_LOADALLFILE; |
+ pTrailer->Release(); |
+ return TRUE; |
} |
FX_DWORD xrefpos = GetDirectInteger(pTrailer->GetDict(), FX_BSTRC("Prev")); |
if (xrefpos) { |
@@ -4232,8 +4230,7 @@ FX_BOOL CPDF_DataAvail::CheckUnkownPageNode(FX_DWORD dwPageNo, |
} |
pPageNode->m_dwPageNo = dwPageNo; |
CPDF_Dictionary* pDict = pPage->GetDict(); |
Lei Zhang
2015/09/04 21:10:40
Check on line 4226.
|
- CFX_ByteString type = |
- pDict ? pDict->GetString(FX_BSTRC("Type")) : CFX_ByteString(); |
+ CFX_ByteString type = pDict->GetString(FX_BSTRC("Type")); |
if (type == FX_BSTRC("Pages")) { |
pPageNode->m_type = PDF_PAGENODE_PAGES; |
CPDF_Object* pKids = pDict->GetElement(FX_BSTRC("Kids")); |