diff options
| author | weili <weili@chromium.org> | 2016-09-01 14:39:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-01 14:39:41 -0700 |
| commit | 7c5d090719a25f0c1b81fb6b46544b9394a7fdd2 (patch) | |
| tree | 8c341dd8f815902f77c7b6a3a569b8d24944b2c2 /core/fpdfdoc/cpdf_annot.cpp | |
| parent | 4bae296c1eee7a1ecae8bab3d59dd9430218f730 (diff) | |
| download | pdfium-7c5d090719a25f0c1b81fb6b46544b9394a7fdd2.tar.xz | |
Fix leaks due to created popup annotationschromium/2847
When we create popup annotations, we also create the dictionary
associated with it. For regular annotations, the dictionary
associated with an annotation is not owned by annotation,
and will be released separately. But our created dictionary is not
associated with any other data structure, it would be leaked if not
released by the associated annotation.
Add a boolean to indicate the ownership to the dictionary, and release
the owned dictionary during the destruction of an annotation.
BUG=pdfium:242
Review-Url: https://codereview.chromium.org/2301613002
Diffstat (limited to 'core/fpdfdoc/cpdf_annot.cpp')
| -rw-r--r-- | core/fpdfdoc/cpdf_annot.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index 6525ff620c..942d334a2d 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -18,8 +18,11 @@ #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" -CPDF_Annot::CPDF_Annot(CPDF_Dictionary* pDict, CPDF_Document* pDocument) - : m_pAnnotDict(pDict), +CPDF_Annot::CPDF_Annot(CPDF_Dictionary* pDict, + CPDF_Document* pDocument, + bool bToOwnDict) + : m_bOwnedAnnotDict(bToOwnDict), + m_pAnnotDict(pDict), m_pDocument(pDocument), m_bOpenState(false), m_pPopupAnnot(nullptr) { @@ -28,6 +31,8 @@ CPDF_Annot::CPDF_Annot(CPDF_Dictionary* pDict, CPDF_Document* pDocument) } CPDF_Annot::~CPDF_Annot() { + if (m_bOwnedAnnotDict) + m_pAnnotDict->Release(); ClearCachedAP(); } |