summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-10-03 23:29:26 -0700
committerLei Zhang <thestig@chromium.org>2015-10-03 23:29:26 -0700
commit0ecd473f0844b4c0b4a95360216af68de3a3570b (patch)
tree19159fbe6ff858eaf5ed9522d2f1da6e6c431e8e /core/include
parent8c217c537fc845763018a5d81a8c55b1045f6ccd (diff)
downloadpdfium-0ecd473f0844b4c0b4a95360216af68de3a3570b.tar.xz
Merge to XFA: Fix NULL pointer dereference in CPDF_InterForm.
BUG=537772 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1387703002 . (cherry picked from commit 4f277fc8d41303cbf007335dfbbff60b81fffde0) Review URL: https://codereview.chromium.org/1380603006 .
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fpdfdoc/fpdf_doc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index b2ac747427..038bf90a17 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -738,7 +738,7 @@ class CPDF_InterForm : public CFX_PrivateData {
int CompareFieldName(const CFX_ByteString& name1,
const CFX_ByteString& name2);
- CPDF_Document* m_pDocument;
+ CPDF_Document* const m_pDocument;
FX_BOOL m_bGenerateAP;
@@ -746,7 +746,7 @@ class CPDF_InterForm : public CFX_PrivateData {
std::map<const CPDF_Dictionary*, CPDF_FormControl*> m_ControlMap;
- CFieldTree* m_pFieldTree;
+ nonstd::unique_ptr<CFieldTree> m_pFieldTree;
CFX_ByteString m_bsEncoding;