ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-02-22 06:33:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix segfault in EditFunctionMenu (#868)

Browse Source
This commit is contained in:
Paul 2018-10-22 15:31:50 -07:00 committed by xarkes
parent f0fc9fc5e3
commit 528adf429a
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/menus/DisassemblyContextMenu.cpp
View File

@ -267,8 +267,6 @@ void DisassemblyContextMenu::aboutToShowSlot()
actionAnalyzeFunction.setVisible(false); actionAnalyzeFunction.setVisible(false);
actionRename.setVisible(true); actionRename.setVisible(true);
actionRename.setText(tr("Rename function \"%1\"").arg(fcn->name)); actionRename.setText(tr("Rename function \"%1\"").arg(fcn->name));
actionEditFunction.setVisible(true);
actionEditFunction.setText(tr("Edit function \"%1\"").arg(fcn->name));
} else if (f) { } else if (f) {
actionRename.setVisible(true); actionRename.setVisible(true);
actionRename.setText(tr("Rename flag \"%1\"").arg(f->name)); actionRename.setText(tr("Rename flag \"%1\"").arg(f->name));
@ -280,10 +278,13 @@ void DisassemblyContextMenu::aboutToShowSlot()
if(in_fcn) if(in_fcn)
{ {
actionSetFunctionVarTypes.setVisible(true); actionSetFunctionVarTypes.setVisible(true);
actionEditFunction.setVisible(true);
actionEditFunction.setText(tr("Edit function \"%1\"").arg(in_fcn->name));
} }
else else
{ {
actionSetFunctionVarTypes.setVisible(false); actionSetFunctionVarTypes.setVisible(false);
actionEditFunction.setVisible(false);
} }
@ -693,8 +694,9 @@ void DisassemblyContextMenu::on_actionEditFunction_triggered()
{ {
RCore *core = Core()->core(); RCore *core = Core()->core();
EditFunctionDialog *dialog = new EditFunctionDialog(this); EditFunctionDialog *dialog = new EditFunctionDialog(this);
RAnalFunction *fcn = r_anal_get_fcn_at (core->anal, offset, R_ANAL_FCN_TYPE_NULL); RAnalFunction *fcn = r_anal_get_fcn_in(core->anal, offset, 0);
if (fcn) {
dialog->setWindowTitle(tr("Edit function %1").arg(fcn->name)); dialog->setWindowTitle(tr("Edit function %1").arg(fcn->name));
dialog->setNameText(fcn->name); dialog->setNameText(fcn->name);
@ -727,6 +729,7 @@ void DisassemblyContextMenu::on_actionEditFunction_triggered()
emit Core()->functionsChanged(); emit Core()->functionsChanged();
} }
} }
}
void DisassemblyContextMenu::setBase(QString base) void DisassemblyContextMenu::setBase(QString base)
{ {