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

Fixed memory leak and refactored code (#1181)

Browse Source
This commit is contained in:
Gaurav Kumar Ghildiyal 2019-02-11 20:24:02 +05:30 committed by Itay Cohen
parent c9ce15f6dd
commit 2f804380fc
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Cutter.cpp
View File

@ -2271,11 +2271,22 @@ QString CutterCore::addTypes(const char *str)
char *error_msg = nullptr;
char *parsed = r_parse_c_string(core_->anal, str, &error_msg);
if (!parsed && error_msg) {
return QString(error_msg);
if (!parsed) {
QString ret;
if (error_msg) {
ret = error_msg;
r_mem_free(error_msg);
}
return ret;
}
sdb_query_lines(core_->anal->sdb_types, parsed);
r_mem_free(parsed);
if (error_msg) {
r_mem_free(error_msg);
}
return QString();
}

6
src/dialogs/LoadNewTypesDialog.cpp
View File

@ -28,11 +28,7 @@ void LoadNewTypesDialog::on_selectFileButton_clicked()
Config()->setRecentFolder(QFileInfo(filename).absolutePath());
QFile file(filename);
if (!file.open(QIODevice::ReadOnly)) {
QMessageBox popup(this);
popup.setWindowTitle(tr("Error"));
popup.setText(file.errorString());
popup.setStandardButtons(QMessageBox::Ok);
popup.exec();
QMessageBox::critical(this, tr("Error"), file.errorString());
on_selectFileButton_clicked();
return;
}

28
src/widgets/TypesWidget.cpp
View File

@ -245,11 +245,7 @@ void TypesWidget::on_actionExport_Types_triggered()
Config()->setRecentFolder(QFileInfo(filename).absolutePath());
QFile file(filename);
if (!file.open(QIODevice::WriteOnly)) {
QMessageBox popup(this);
popup.setWindowTitle(tr("Error"));
popup.setText(file.errorString());
popup.setStandardButtons(QMessageBox::Ok);
popup.exec();
QMessageBox::critical(this, tr("Error"), file.errorString());
on_actionExport_Types_triggered();
return;
}
@ -260,24 +256,26 @@ void TypesWidget::on_actionExport_Types_triggered()
void TypesWidget::on_actionLoad_New_Types_triggered()
{
LoadNewTypesDialog *dialog = new LoadNewTypesDialog(this);
connect(dialog, SIGNAL(newTypesLoaded()), this, SLOT(refreshTypes()));
dialog->setWindowTitle(tr("Load New Types"));
dialog->exec();
LoadNewTypesDialog dialog(this);
connect(&dialog, SIGNAL(newTypesLoaded()), this, SLOT(refreshTypes()));
dialog.setWindowTitle(tr("Load New Types"));
dialog.exec();
}
void TypesWidget::on_actionDelete_Type_triggered()
{
QModelIndex proxyIndex = ui->typesTreeView->currentIndex();
if (!proxyIndex.isValid()) {
return;
}
QModelIndex index = types_proxy_model->mapToSource(proxyIndex);
if (!index.isValid()) {
return;
}
TypeDescription exp = index.data(TypesModel::TypeDescriptionRole).value<TypeDescription>();
QMessageBox popup(this);
popup.setIcon(QMessageBox::Question);
popup.setText(tr("Are you sure you want to delete \"%1\"?").arg(exp.type));
popup.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
popup.setDefaultButton(QMessageBox::Yes);
if (popup.exec() == QMessageBox::Yes) {
QMessageBox::StandardButton reply = QMessageBox::question(this, tr("Cutter"), tr("Are you sure you want to delete \"%1\"?").arg(exp.type));
if (reply == QMessageBox::Yes) {
types_model->removeRow(index.row());
}
}