diff options
| author | npm <npm@chromium.org> | 2016-11-23 14:47:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-23 14:47:35 -0800 |
| commit | 4e847e36fe013bcfddf71c79221887a308b9fadb (patch) | |
| tree | 6a029f6d2d19ba3f8ff919f10f031e1c46867a3f /xfa/fxfa/fm2js/xfa_expression.cpp | |
| parent | 9fd0c630ea2225fc544949d88d1bf63acc43112e (diff) | |
| download | pdfium-4e847e36fe013bcfddf71c79221887a308b9fadb.tar.xz | |
More unique_ptrs in CXFA_FMParse::ParseForeachExpression and avoid leak
Commit a31098417852bdf13e693a6e0913e0706cf94098 accidentally caused a
leak. Replaced pointers with unique_ptr to prevent this from happening.
BUG=664891
Review-Url: https://codereview.chromium.org/2528543003
Diffstat (limited to 'xfa/fxfa/fm2js/xfa_expression.cpp')
| -rw-r--r-- | xfa/fxfa/fm2js/xfa_expression.cpp | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/xfa/fxfa/fm2js/xfa_expression.cpp b/xfa/fxfa/fm2js/xfa_expression.cpp index 6895f25438..5734593ff8 100644 --- a/xfa/fxfa/fm2js/xfa_expression.cpp +++ b/xfa/fxfa/fm2js/xfa_expression.cpp @@ -510,21 +510,14 @@ void CXFA_FMForExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) { CXFA_FMForeachExpression::CXFA_FMForeachExpression( uint32_t line, const CFX_WideStringC& wsIdentifier, - CFX_ArrayTemplate<CXFA_FMSimpleExpression*>* pAccessors, + std::vector<std::unique_ptr<CXFA_FMSimpleExpression>>&& pAccessors, CXFA_FMExpression* pList) : CXFA_FMLoopExpression(line), m_wsIdentifier(wsIdentifier), - m_pAccessors(pAccessors), + m_pAccessors(std::move(pAccessors)), m_pList(pList) {} -CXFA_FMForeachExpression::~CXFA_FMForeachExpression() { - if (m_pAccessors) { - for (int i = 0; i < m_pAccessors->GetSize(); ++i) - m_pAccessors->GetAt(i); - - delete m_pAccessors; - } -} +CXFA_FMForeachExpression::~CXFA_FMForeachExpression() {} void CXFA_FMForeachExpression::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << FX_WSTRC(L"{\n"); @@ -543,10 +536,10 @@ void CXFA_FMForeachExpression::ToJavaScript(CFX_WideTextBuf& javascript) { javascript << XFA_FM_EXPTypeToString(CONCATFMOBJECT); javascript << FX_WSTRC(L"("); - for (int i = 0; i < m_pAccessors->GetSize(); ++i) { - CXFA_FMSimpleExpression* s = m_pAccessors->GetAt(i); + for (size_t i = 0; i < m_pAccessors.size(); ++i) { + CXFA_FMSimpleExpression* s = m_pAccessors.at(i).get(); s->ToJavaScript(javascript); - if (i + 1 < m_pAccessors->GetSize()) { + if (i + 1 < m_pAccessors.size()) { javascript << FX_WSTRC(L", "); } } @@ -594,10 +587,10 @@ void CXFA_FMForeachExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) { javascript << FX_WSTRC(L" = "); javascript << XFA_FM_EXPTypeToString(CONCATFMOBJECT); javascript << FX_WSTRC(L"("); - for (int i = 0; i < m_pAccessors->GetSize(); ++i) { - CXFA_FMSimpleExpression* s = m_pAccessors->GetAt(i); + for (size_t i = 0; i < m_pAccessors.size(); ++i) { + CXFA_FMSimpleExpression* s = m_pAccessors.at(i).get(); s->ToJavaScript(javascript); - if (i + 1 < m_pAccessors->GetSize()) { + if (i + 1 < m_pAccessors.size()) { javascript << FX_WSTRC(L", "); } } |