Skip to content

C
core
Kaydet (Commit) ac44fc6b authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

coverity#1187860 Uninitialized pointer field 

Change-Id: Ia68958ddb904cbb50969b3b184777ddd49ccb677
üst cadddf16
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
sw/source/ui/uno/unomailmerge.cxx
Dosyayı görüntüle @ ac44fc6b
...@@ -415,20 +415,22 @@ SwXMailMerge::~SwXMailMerge() ...@@ -415,20 +415,22 @@ SwXMailMerge::~SwXMailMerge()
// Guarantee object consistence in case of an exception // Guarantee object consistence in case of an exception
class MailMergeExecuteFinalizer { class MailMergeExecuteFinalizer {
public: public:
MailMergeExecuteFinalizer(SwXMailMerge *mailmerge) { MailMergeExecuteFinalizer(SwXMailMerge *mailmerge)
OSL_ENSURE( mailmerge, "mailmerge object missing" ); : m_pMailMerge(mailmerge)
this->m_aMailMerge = mailmerge; {
assert(m_pMailMerge); //mailmerge object missing
} }
~MailMergeExecuteFinalizer() { ~MailMergeExecuteFinalizer()
{
osl::MutexGuard pMgrGuard( GetMailMergeMutex() ); osl::MutexGuard pMgrGuard( GetMailMergeMutex() );
m_aMailMerge->m_pMgr = 0; m_pMailMerge->m_pMgr = 0;
} }
private: private:
// Disallow copy // Disallow copy
MailMergeExecuteFinalizer(const MailMergeExecuteFinalizer&) {} MailMergeExecuteFinalizer(const MailMergeExecuteFinalizer&) {}
SwXMailMerge *m_aMailMerge; SwXMailMerge *m_pMailMerge;
}; };
uno::Any SAL_CALL SwXMailMerge::execute( uno::Any SAL_CALL SwXMailMerge::execute(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment