From 5cf4b86ab3edc38d00bb052149ad760b5923dbf4 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Fri, 29 Jan 2021 11:26:36 -0500
Subject: [PATCH] Fix keystone include path to use the internal keystone
---
irdb-libs/libIRDB-core/src/SConscript | 2 +-
irdb-libs/libIRDB-core/src/address.cpp | 14 +-------------
irdb-libs/libIRDB-core/src/fileir.cpp | 2 +-
irdb-libs/libIRDB-core/src/instruction.cpp | 2 +-
4 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/irdb-libs/libIRDB-core/src/SConscript b/irdb-libs/libIRDB-core/src/SConscript
index eeeb4b8a2..dc1bfa956 100644
--- a/irdb-libs/libIRDB-core/src/SConscript
+++ b/irdb-libs/libIRDB-core/src/SConscript
@@ -50,7 +50,7 @@ cpppath='''
$SECURITY_TRANSFORMS_HOME/include/
$SECURITY_TRANSFORMS_HOME/libIRDB-core/include/
$SECURITY_TRANSFORMS_HOME/third_party/capstone/include/capstone/
- $SECURITY_TRANSFORMS_HOME/third_party/keystone/include/keystone/
+ $SECURITY_TRANSFORMS_HOME/third_party/keystone/include/
'''
libpath='''
$SECURITY_TRANSFORMS_HOME/lib
diff --git a/irdb-libs/libIRDB-core/src/address.cpp b/irdb-libs/libIRDB-core/src/address.cpp
index cb5bb7ebb..efdc7183d 100644
--- a/irdb-libs/libIRDB-core/src/address.cpp
+++ b/irdb-libs/libIRDB-core/src/address.cpp
@@ -26,25 +26,13 @@
using namespace libIRDB;
using namespace std;
-
vector<string> AddressID_t::WriteToDB(File_t *fid, db_id_t newid, bool p_withHeader)
{
assert(fid);
- if(getBaseID()==NOT_IN_DATABASE)
+ if(getBaseID() == NOT_IN_DATABASE)
setBaseID(newid);
-/*
- string q;
- if (p_withHeader)
- q=string("insert into ")+fid->address_table_name +
- string("(address_id , file_id , vaddress_offset , doip_id)") +
- string(" values ");
- else
- q = ",";
-
- q +=
-*/
return {
to_string(getBaseID()),
to_string(fileID),
diff --git a/irdb-libs/libIRDB-core/src/fileir.cpp b/irdb-libs/libIRDB-core/src/fileir.cpp
index 2b7ee0498..c48eb5175 100644
--- a/irdb-libs/libIRDB-core/src/fileir.cpp
+++ b/irdb-libs/libIRDB-core/src/fileir.cpp
@@ -19,7 +19,7 @@
*
*/
-#include <keystone.h>
+#include <keystone/keystone.h>
#include <all.hpp>
#include <irdb-util>
#include <cstdlib>
diff --git a/irdb-libs/libIRDB-core/src/instruction.cpp b/irdb-libs/libIRDB-core/src/instruction.cpp
index 44975ae7f..413a8adbb 100644
--- a/irdb-libs/libIRDB-core/src/instruction.cpp
+++ b/irdb-libs/libIRDB-core/src/instruction.cpp
@@ -25,7 +25,7 @@
#include <sstream>
#include <iomanip>
#include <irdb-util>
-#include <keystone.h>
+#include <keystone/keystone.h>
#include "cmdstr.hpp"
#undef EIP
--
GitLab