ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-19 19:36:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

better bounds checking in memorywidget

Browse Source
This commit is contained in:
mrexodia 2017-03-30 04:49:04 +02:00
parent 6d36756c7a
commit 0f2f037977
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/widgets/memwidget/memorywidget.cpp
View File

@ -1345,7 +1345,9 @@ void MemoryWidget::fillOffsetInfo( QString off) {
// Add opcode description // Add opcode description
QStringList description = this->main->core->cmd("?d. @ " + off).split(": "); QStringList description = this->main->core->cmd("?d. @ " + off).split(": ");
ui->opcodeDescText->setPlainText("# " + description[0] + ":\n" + description[1]); if(description.length() >= 2) {
ui->opcodeDescText->setPlainText("# " + description[0] + ":\n" + description[1]);
}
} }
void MemoryWidget::create_graph(QString off) { void MemoryWidget::create_graph(QString off) {
@ -1379,14 +1381,13 @@ void MemoryWidget::setFcnName(QString addr) {
// TDOD: FIX ME, ugly // TDOD: FIX ME, ugly
if (addr.contains("0x")) { if (addr.contains("0x")) {
fcn = this->main->core->functionAt(addr.toLong(&ok, 16)); fcn = this->main->core->functionAt(addr.toULongLong(&ok, 16));
if (fcn->name != "") { if (ok && fcn && fcn->name != "") {
QString segment = this->main->core->cmd("S. @ " + addr).split(" ").last(); QString segment = this->main->core->cmd("S. @ " + addr).split(" ").last();
ui->fcnNameEdit->setText(segment.trimmed() + ":"+ fcn->name); addr = segment.trimmed() + ":"+ fcn->name;
} }
} else {
ui->fcnNameEdit->setText(addr);
} }
ui->fcnNameEdit->setText(addr);
} }
void MemoryWidget::on_disasTextEdit_2_cursorPositionChanged() void MemoryWidget::on_disasTextEdit_2_cursorPositionChanged()
@ -1398,7 +1399,6 @@ void MemoryWidget::on_disasTextEdit_2_cursorPositionChanged()
QString ele = lastline.split(" ", QString::SkipEmptyParts)[0]; QString ele = lastline.split(" ", QString::SkipEmptyParts)[0];
if (ele.contains("0x")) { if (ele.contains("0x")) {
this->fillOffsetInfo(ele); this->fillOffsetInfo(ele);
QString at = this->main->core->cmdFunctionAt(ele); QString at = this->main->core->cmdFunctionAt(ele);
QString deco = this->main->core->getDecompiledCode(at); QString deco = this->main->core->getDecompiledCode(at);
@ -1579,6 +1579,7 @@ bool MemoryWidget::eventFilter(QObject *obj, QEvent *event) {
} }
} }
} }
return false; //allow the event to be handled further
} }
void MemoryWidget::on_actionXRefs_triggered() void MemoryWidget::on_actionXRefs_triggered()