Fic crash for repeated pasting from complex docs

[features.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 0ed82d6d860e24c95de339c200d5aca437212f99..cef66b5e5eb3ded9977f6b3d863335b7b9341a09 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -478,12 +478,17 @@ void putClipboard(ParagraphList const & paragraphs,
        // to be so, but the alternative is to construct a new one of these (with a
        // new temporary directory, etc) every time, and then to destroy it. So maybe
        // it's worth just keeping this one around.
-       static Buffer * buffer = theBufferList().newInternalBuffer(
+       Buffer * staticbuffer = theBufferList().newInternalBuffer(
                FileName::tempName("clipboard.internal").absFileName());
 
        // These two things only really need doing the first time.
-       buffer->setUnnamed(true);
-       buffer->inset().setBuffer(*buffer);
+       staticbuffer->setUnnamed(true);
+       staticbuffer->inset().setBuffer(*staticbuffer);
+
+       // Use a clone for the complicated stuff so that we do not need to clean
+       // up in order to avoid a crash.
+       Buffer * buffer = staticbuffer->cloneBufferOnly();
+       LASSERT(buffer, return);
 
        // This needs doing every time.
        buffer->params().setDocumentClass(docclass);
@@ -521,7 +526,7 @@ void putClipboard(ParagraphList const & paragraphs,
        theClipboard().put(lyx, oshtml.str(), plaintext);
 
        // Save that memory
-       buffer->paragraphs().clear();
+       delete buffer;
 }