Skip to content

Commit 18a01fb

Browse files
committed
Release 6.0.7
* Indent the whole codebase * Do not install the clang-format-radare2 script in dist iaito * Add the dummy assert for windows
1 parent 2cf5412 commit 18a01fb

File tree

15 files changed

+119
-81
lines changed

15 files changed

+119
-81
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: iaito CI
22

33
env:
4-
R2V: 6.0.4
4+
R2V: 6.0.7
55
QT_MAC_INSTALL_VERSION: 6.9.*
66
QT_WIN_INSTALL_VERSION: 6.8.*
77

dist/macos/scripts/embed-radare2.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ R2V=$(readlink "${R2DIR}/lib/radare2/last")
1010
fix_binary() {
1111
FILE=$1
1212
PREFIX=$2
13+
if [ -n "`echo ${FILE} | grep clang-format-radare2`" ]; then
14+
return
15+
fi
1316
shift 2
1417
echo "Change library paths for \"$FILE\"..."
1518
ARGS=$(otool -L "$FILE" | awk 'BEGIN{ORS=" "}/\/usr\/local\/lib\/libr_/{dst=$1; sub(/\/usr\/local\/lib/,"'"$PREFIX"'", dst); print "-change "$1" "dst}')

src/assert.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#ifndef CUSTOM_ASSERT_H
2+
#define CUSTOM_ASSERT_H 1
3+
4+
#define assert(x) if ((x)) {}
5+
6+
#endif

src/common/PythonManager.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#ifdef IAITO_ENABLE_PYTHON
22

3-
#include <cassert>
43

54
#include "Iaito.h"
65
#include "PythonAPI.h"
@@ -176,7 +175,6 @@ void PythonManager::restoreThread()
176175
void PythonManager::saveThread()
177176
{
178177
pyThreadStateCounter--;
179-
assert(pyThreadStateCounter >= 0);
180178
if (pyThreadStateCounter == 0) {
181179
pyThreadState = PyEval_SaveThread();
182180
}

src/common/R2Task.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ R2Task::R2Task(const QString &cmd, bool transient)
66
task = r_core_task_new(
77
Core()->core(),
88
#if R2_VERSION_NUMBER >= 60005
9-
R_CORE_TASK_MODE_THREAD,
9+
R_CORE_TASK_MODE_THREAD,
1010
#endif
1111
true,
1212
cmd.toLocal8Bit().constData(),
@@ -49,7 +49,7 @@ void R2Task::startTask()
4949
void R2Task::breakTask()
5050
{
5151
if (task) {
52-
// r_core_task_break(&Core()->core_->tasks, task->id);
52+
// r_core_task_break(&Core()->core_->tasks, task->id);
5353
}
5454
}
5555

src/common/TempConfig.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11

2-
#include <cassert>
3-
42
#include "TempConfig.h"
53
#include "core/Iaito.h"
64

@@ -29,7 +27,6 @@ TempConfig::~TempConfig()
2927
Core()->setConfig(i.key(), i.value().toBool());
3028
break;
3129
default:
32-
assert(false);
3330
break;
3431
}
3532
}

src/core/Iaito.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <QStringList>
1010
#include <QVector>
1111

12-
#include <cassert>
1312
#include <cstring>
1413
#include <memory>
1514

@@ -172,7 +171,6 @@ RCoreLocked::RCoreLocked(IaitoCore *core)
172171
{
173172
core->coreMutex.lock();
174173
#if R2_VERSION_NUMBER < 50609
175-
assert(core->coreLockDepth >= 0);
176174
core->coreLockDepth++;
177175
if (core->coreLockDepth == 1) {
178176
if (core->coreBed) {
@@ -187,7 +185,6 @@ RCoreLocked::~RCoreLocked()
187185
{
188186
core->coreLockDepth--;
189187
#if R2_VERSION_NUMBER < 50609
190-
assert(core->coreLockDepth >= 0);
191188
if (core->coreLockDepth == 0) {
192189
#if R2_VERSION_NUMBER >= 50909
193190
core->coreBed = r_cons_sleep_begin(core->core_->cons);

src/core/MainWindow.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ private slots:
294294
NewFileDialog *newFileDialog = nullptr;
295295
IaitoDockWidget *breakpointDock = nullptr;
296296
IaitoDockWidget *registerRefsDock = nullptr;
297-
MapsWidget *mapsDock = nullptr; // RIO map manager
298-
FilesWidget *filesDock = nullptr; // IO files manager
297+
MapsWidget *mapsDock = nullptr; // RIO map manager
298+
FilesWidget *filesDock = nullptr; // IO files manager
299299
FilesystemWidget *filesystemDock = nullptr; // Filesystem mount manager
300-
BinariesWidget *binariesDock = nullptr; // IO binaries manager
300+
BinariesWidget *binariesDock = nullptr; // IO binaries manager
301301
R2GraphWidget *r2GraphDock = nullptr;
302302
CallGraphWidget *callGraphDock = nullptr;
303303
CallGraphWidget *globalCallGraphDock = nullptr;

src/core/assert.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#ifndef CUSTOM_ASSERT_H
2+
#define CUSTOM_ASSERT_H 1
3+
4+
#define assert(x) if ((x)) {}
5+
6+
#endif

src/menus/DisassemblyContextMenu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ void DisassemblyContextMenu::on_actionRename_triggered()
10171017
break;
10181018
default:
10191019
qWarning() << "Unhandled renaming action: " << doRenameAction;
1020-
assert(false);
1020+
// assert(false);
10211021
break;
10221022
}
10231023

0 commit comments

Comments
 (0)