Set buffer when expanding macro

This avoids a crash in InsetMathSplit which uses the buffer() value.

Fixes bug #11686.

(cherry picked from commit 19abf29ea0cf89cdc99b9327448146aeb35d1dc1)

diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp
index 5e72eecdc27850b4737e833593b420df9f9f4bdb..d354412edd15cd16507ae0961aaa34e909c77fec 100644 (file)
--- a/src/mathed/InsetMathMacro.cpp
+++ b/src/mathed/InsetMathMacro.cpp
@@ -669,8 +669,9 @@ void InsetMathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc,
        // than the one protected by UpdateLocker.
        docstring const & display = d->macro_->display();
        docstring const latexname = from_ascii("\\") + macroName();
        // than the one protected by UpdateLocker.
        docstring const & display = d->macro_->display();
        docstring const latexname = from_ascii("\\") + macroName();

-       if (d->macro_->expand(values, d->expanded_)
-           && !support::contains(display, latexname)) {
+       bool const ret = d->macro_->expand(values, d->expanded_);
+       d->expanded_.setBuffer(buffer());
+       if (ret && !support::contains(display, latexname)) {

                if (utype == OutputUpdate && !d->expanded_.empty())
                        d->expanded_.updateMacros(cur, mc, utype, nesting);
        }
                if (utype == OutputUpdate && !d->expanded_.empty())
                        d->expanded_.updateMacros(cur, mc, utype, nesting);
        }

diff --git a/status.23x b/status.23x
index e005d5eedc5b2e4b71fd8885650ed2cecc2fc213..bb1fd59f081e089328b47c3edfccfe22d8ce5bfc 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -150,6 +150,8 @@ What's new
 
 - Fix bad caret position when row scrolls horizontally (bug 11603).
 
 
 - Fix bad caret position when row scrolls horizontally (bug 11603).
 

+- Fix crash when inserting some macros (bug 11686).
+

 
 * INTERNALS
 
 
 * INTERNALS