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

Fix crash when modifying an InsetRef inserted by the current author.

Browse Source 
The problem was that, in this case, we actually delete the current inset
in changeCmdName. So when we return from that and attempt to call initView(),
we're in a non-existent inset.
This commit is contained in:
Richard Kimberly Heck 2023-07-28 22:57:57 -04:00
parent 343cf06d19
commit aacc5147b6
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Cursor.cpp
View File

@ -789,15 +789,15 @@ void Cursor::dispatch(FuncRequest const & cmd0)
beginUndoGroup();
Inset * nextins = nextInset();
// Is this a function that acts on inset at point?
if (lyxaction.funcHasFlag(cmd.action(), LyXAction::AtPoint)
&& nextInset()) {
if (lyxaction.funcHasFlag(cmd.action(), LyXAction::AtPoint) && nextins) {
disp_.dispatched(true);
disp_.screenUpdate(Update::FitCursor | Update::Force);
FuncRequest tmpcmd = cmd;
LYXERR(Debug::ACTION, "Cursor::dispatch: (AtPoint) cmd: "
<< cmd0 << endl << *this);
nextInset()->dispatch(*this, tmpcmd);
nextins->dispatch(*this, tmpcmd);
if (disp_.dispatched()) {
endUndoGroup();
return;

26
src/insets/InsetCommand.cpp
View File

@ -20,6 +20,7 @@
#include "Cursor.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "InsetIterator.h"
#include "Lexer.h"
#include "LyX.h"
#include "MetricsInfo.h"
@ -191,7 +192,30 @@ void InsetCommand::changeCmdName(string const & new_name)
if (buffer().masterParams().track_changes) {
// With change tracking, we insert a new inset and
// delete the old one
// delete the old one.
// But we need to make sure that the inset isn't one
// that the current author inserted. Otherwise, we might
// delete ourselves!
InsetIterator it = begin(buffer().inset());
InsetIterator const itend = end(buffer().inset());
for (; it != itend; ++it) {
if (&*it == this)
break;
}
if (it == itend) {
LYXERR0("Unable to find inset!");
p_.setCmdName(new_name);
return;
}
Paragraph const & ourpara = it.paragraph();
pos_type const ourpos = it.pos();
Change const & change = ourpara.lookupChange(ourpos);
if (change.currentAuthor()) {
p_.setCmdName(new_name);
return;
}
// OK, so this is not an inset the current author inserted
InsetCommandParams p(p_.code());
p = p_;
p.setCmdName(new_name);