Update parent buffer as soon as a child has been released

This prevents dangling pointers that might crash LyX.

Fixes: #9979.

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index fd3f19de77c6f65dbeff18e0852105a9d5650c30..cec9d2d76d7910f0510813929bb1b200163469a4 100644 (file)
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -98,10 +98,15 @@ void BufferList::release(Buffer * buf)
        BufferStorage::iterator const it =
                find(bstore.begin(), bstore.end(), buf);
        if (it != bstore.end()) {
+               Buffer const * parent = buf ? buf->parent() : 0;
                Buffer * tmp = (*it);
                bstore.erase(it);
                LASSERT(tmp, return);
                delete tmp;
+               if (parent)
+                       // If this was a child, update the parent's buffer
+                       // to avoid crashes due to dangling pointers (bug 9979)
+                       parent->updateBuffer();
        }
 }
 

diff --git a/status.22x b/status.22x
index 6a06b68d03049f39023771a7c461ed17b915d9af..eb891c81a5e8efd641d1650667a9dd155fa4fe0d 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -71,6 +71,9 @@ What's new
 
 - Fix crash when closing master file with full view source open (bug 10560).
 
+- Fix crash when closing master document with dirty child while Document
+  Settings dialog is open (bug 9979).
+
 - Remove duplicate entries from the Symbols dialog (bug 10644).
 
 - Always show the float type in the float inset label (bug 10618).