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

Fix recursive math macro crash (bug #9140)

Browse Source 
This is different from bug #8999, since in this case a new macro instance is
created. You still get a TeX capacity exceeded error if you try to typeset the
exported document, but this is the same as for bug #8999 and better than a
crash.
This commit is contained in:
Georg Baum 2014-11-14 21:30:42 +01:00
parent 0bf8b8a1d2
commit 0f2069b8a5
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mathed/MacroTable.cpp
View File

@ -62,7 +62,7 @@ MacroData::MacroData(Buffer * buf, MathMacroTemplate const & macro)
} }
void MacroData::expand(vector<MathData> const & args, MathData & to) const bool MacroData::expand(vector<MathData> const & args, MathData & to) const
{ {
updateData(); updateData();
@ -70,10 +70,10 @@ void MacroData::expand(vector<MathData> const & args, MathData & to) const
static InsetMathSqrt inset(0); static InsetMathSqrt inset(0);
inset.setBuffer(const_cast<Buffer &>(*buffer_)); inset.setBuffer(const_cast<Buffer &>(*buffer_));
// FIXME UNICODE docstring const & definition(display_.empty() ? definition_ : display_);
asArray(display_.empty() ? definition_ : display_, inset.cell(0)); asArray(definition, inset.cell(0));
//lyxerr << "MathData::expand: args: " << args << endl; //lyxerr << "MathData::expand: args: " << args << endl;
//lyxerr << "MathData::expand: ar: " << inset.cell(0) << endl; //LYXERR0("MathData::expand: ar: " << inset.cell(0));
for (DocIterator it = doc_iterator_begin(buffer_, &inset); it; it.forwardChar()) { for (DocIterator it = doc_iterator_begin(buffer_, &inset); it; it.forwardChar()) {
if (!it.nextInset()) if (!it.nextInset())
continue; continue;
@ -87,8 +87,12 @@ void MacroData::expand(vector<MathData> const & args, MathData & to) const
it.cell().insert(it.pos(), args[n - 1]); it.cell().insert(it.pos(), args[n - 1]);
} }
} }
//lyxerr << "MathData::expand: res: " << inset.cell(0) << endl; //LYXERR0("MathData::expand: res: " << inset.cell(0));
to = inset.cell(0); to = inset.cell(0);
// If the result is equal to the definition then we either have a
// recursive loop, or the definition did not contain any macro in the
// first place.
return asString(to) != definition;
} }

3
src/mathed/MacroTable.h
View File

@ -52,7 +52,8 @@ public:
size_t numargs() const { updateData(); return numargs_; } size_t numargs() const { updateData(); return numargs_; }
/// replace #1,#2,... by given MathAtom 0,1,.., _including_ the possible /// replace #1,#2,... by given MathAtom 0,1,.., _including_ the possible
/// optional argument /// optional argument
void expand(std::vector<MathData> const & from, MathData & to) const; /// \return whether anything was expanded
bool expand(std::vector<MathData> const & from, MathData & to) const;
/// number of optional arguments /// number of optional arguments
size_t optionals() const; size_t optionals() const;
/// ///

9
src/mathed/MathMacro.cpp
View File

@ -331,6 +331,7 @@ private:
void MathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc, void MathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc,
UpdateType utype) UpdateType utype)
{ {
// block recursive calls (bug 8999)
if (isUpdating_) if (isUpdating_)
return; return;
@ -364,9 +365,15 @@ void MathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc,
values[i].insert(0, MathAtom(proxy)); values[i].insert(0, MathAtom(proxy));
} }
// expanding macro with the values // expanding macro with the values
macro_->expand(values, expanded_.cell(0)); // Only update the argument macros if anything was expanded, otherwise
// we would get an endless loop (bug 9140). UpdateLocker does not work
// in this case, since MacroData::expand() creates new MathMacro
// objects, so this would be a different recursion path than the one
// protected by UpdateLocker.
if (macro_->expand(values, expanded_.cell(0))) {
if (utype == OutputUpdate && !expanded_.cell(0).empty()) if (utype == OutputUpdate && !expanded_.cell(0).empty())
expanded_.cell(0).updateMacros(cur, mc, utype); expanded_.cell(0).updateMacros(cur, mc, utype);
}
// get definition for list edit mode // get definition for list edit mode
docstring const & display = macro_->display(); docstring const & display = macro_->display();
asArray(display.empty() ? macro_->definition() : display, definition_); asArray(display.empty() ? macro_->definition() : display, definition_);