anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix memory errors found by Alfredo with valgrind

Browse Source 
BufferParams::setDocumentClass() deletes the old document class of the buffer
and creates a copy of the new one. Therefore, the stored layout pointers in
the paragraphs (actually only one paragraph exists) are dangling afterwards.
Resetting them before setting the document class helps here.
In the long term we need to get rid of BufferParams::setDocumentClass()
completely, this is very ugly.
This commit is contained in:
Georg Baum 2014-11-11 07:42:54 +01:00
parent 8f93600d3f
commit 5deaaa3b13
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/CutAndPaste.cpp
View File

@ -502,6 +502,17 @@ void putClipboard(ParagraphList const & paragraphs,
LASSERT(buffer, return);
// This needs doing every time.
// Since setDocumentClass() causes deletion of the old document class
// we need to reset all layout pointers in paragraphs (otherwise they
// would be dangling).
ParIterator const end = buffer->par_iterator_end();
for (ParIterator it = buffer->par_iterator_begin(); it != end; ++it) {
docstring const name = it->layout().name();
if (docclass->hasLayout(name))
it->setLayout((*docclass)[name]);
else
it->setPlainOrDefaultLayout(*docclass);
}
buffer->params().setDocumentClass(docclass);
// we will use pasteSelectionHelper to copy the paragraphs into the