anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid using a dangling pointer

Browse Source 
This can happen when a macro is copied and then the document where
it is defined is closed. In this case, the macro survives in the
cut stack but the the buffer pointer is dangling.
This commit is contained in:
Enrico Forestieri 2015-06-30 18:54:19 +02:00
parent dd61d8cf3f
commit 305a712bbb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mathed/MathMacro.cpp
View File

@ -22,6 +22,7 @@
#include "MathSupport.h" #include "MathSupport.h"
#include "Buffer.h" #include "Buffer.h"
#include "BufferList.h"
#include "BufferView.h" #include "BufferView.h"
#include "CoordCache.h" #include "CoordCache.h"
#include "Cursor.h" #include "Cursor.h"
@ -207,7 +208,10 @@ MathMacro::MathMacro(MathMacro const & that)
// We need to update d->macro_ by ourselves because in this case // We need to update d->macro_ by ourselves because in this case
// MathData::metrics() is not called when selecting a math inset // MathData::metrics() is not called when selecting a math inset
DocIterator const & pos = d->macroBackup_.pos(); DocIterator const & pos = d->macroBackup_.pos();
d->macro_ = pos.buffer() ? pos.buffer()->getMacro(name(), pos) : 0; Buffer const * buf = pos.buffer();
if (buf && !theBufferList().isLoaded(buf))
buf = 0;
d->macro_ = buf ? buf->getMacro(name(), pos) : 0;
if (!d->macro_) if (!d->macro_)
d->macro_ = &d->macroBackup_; d->macro_ = &d->macroBackup_;
} }
@ -225,7 +229,10 @@ MathMacro & MathMacro::operator=(MathMacro const & that)
// We need to update d->macro_ by ourselves because in this case // We need to update d->macro_ by ourselves because in this case
// MathData::metrics() is not called when selecting a math inset // MathData::metrics() is not called when selecting a math inset
DocIterator const & pos = d->macroBackup_.pos(); DocIterator const & pos = d->macroBackup_.pos();
d->macro_ = pos.buffer() ? pos.buffer()->getMacro(name(), pos) : 0; Buffer const * buf = pos.buffer();
if (buf && !theBufferList().isLoaded(buf))
buf = 0;
d->macro_ = buf ? buf->getMacro(name(), pos) : 0;
if (!d->macro_) if (!d->macro_)
d->macro_ = &d->macroBackup_; d->macro_ = &d->macroBackup_;
} }