fix apilist.txt and 'literal.txt` files search paths (#55);

ignore clang 'nontrivial-memaccess' warning

Author: srgblv

ida-plugin.json

@@ -3,7 +3,7 @@
   "plugin": {
     "name": "hrtng",
     "entryPoint": "hrtng",
-    "version": "3.8.93",
+    "version": "3.8.94",
     "idaVersions": ">=7.3",
     "categories": ["decompilation", "deobfuscation", "malware-analysis"],
     "description" : "IDA Pro plugin with a rich set of features: decryption, deobfuscation, patching, lib code recognition and various pseudocode transformations",

src/apihashes.cpp

@@ -464,8 +464,8 @@ void apihashes_init()
 	static ushort alg = 0;
 	static int64 basis = 0;
 	static int64 prime = 0;
-	char buf[4096];
-	getsysfile(buf, 4096, "apilist.txt", PLG_SUBDIR);
+	char buf[QMAXPATH];
+	getPluginsFile(buf, QMAXPATH, "apilist.txt");
 	qstring format =
 		"STARTITEM 1\n"
 		//title

src/helpers.cpp

@@ -24,6 +24,7 @@
 #include <hexrays.hpp>
 #include <bytes.hpp>
 #include <kernwin.hpp>
+#include <diskio.hpp>
 #include <pro.h>
 #include "warn_on.h"
 
@@ -790,3 +791,12 @@ int LogTail(LogLevel level, const char *fmt, ...)
 	va_end(va);
   return res;
 }
+
+//------------------------------------------------
+char* getPluginsFile(char *buf, size_t bufsize, const char *filename)
+{
+	char *res = getsysfile(buf, bufsize, filename, PLG_SUBDIR "/hrtng");
+	if(res)
+		return res;
+	return getsysfile(buf, bufsize, filename, PLG_SUBDIR);
+}

src/helpers.h

@@ -282,3 +282,5 @@ qstring unique_nameC(const char* name, const char* separator, IsUniqueFunc isUni
 	Log(llError, "FIXME! unique_nameC '%s' is not unique\n", uName.c_str());
 	return uName;
 }
+
+char* getPluginsFile(char *buf, size_t bufsize, const char *filename);

src/hrtng.cpp

@@ -5846,7 +5846,7 @@ plugmod_t*
 	addon.producer = "Sergey Belov and Hex-Rays SA, Milan Bohacek, J.C. Roberts, Alexander Pick, Rolf Rolles, Takahiro Haruyama," \
 									 " Karthik Selvaraj, Ali Rahbar, Ali Pezeshk, Elias Bachaalany, Markus Gaasedelen";
 	addon.url = "https://github.com/KasperskyLab/hrtng";
-	addon.version = "3.8.93";
+	addon.version = "3.8.94";
 	msg("[hrt] %s (%s) v%s for IDA%d\n", addon.id, addon.name, addon.version, IDA_SDK_VERSION);
 
 	if(inited) {

src/lit.cpp

@@ -67,10 +67,10 @@ class ida_local literal_db
 public:
 
 	lit_func_t find_func(const char* funcname) const {
-		return m_functions.find(funcname); 
+		return m_functions.find(funcname);
 	}
-	bool is_func(const lit_func_t& f) const { 
-		return f != m_functions.end(); 
+	bool is_func(const lit_func_t& f) const {
+		return f != m_functions.end();
 	}
 	const lit_arg_t* find_arg (const lit_func_t& lfunc, uint32 argN) const
 	{
@@ -80,8 +80,8 @@ class ida_local literal_db
 		return NULL;
 	}
 
-	lit_struct_t find_struct(const char* strucname) const { 
-		return m_structures.find(strucname); 
+	lit_struct_t find_struct(const char* strucname) const {
+		return m_structures.find(strucname);
 	}
 	bool is_struct(const lit_struct_t& s) const {
 		return s != m_structures.end();
@@ -220,7 +220,7 @@ struct ida_local lit_visitor_t : public ctree_visitor_t
 	bool cmtModified;
 	user_cmts_t *cmts;
 
-	lit_visitor_t(cfunc_t *cfunc) : ctree_visitor_t(CV_FAST), func(cfunc), cmtModified(false) 
+	lit_visitor_t(cfunc_t *cfunc) : ctree_visitor_t(CV_FAST), func(cfunc), cmtModified(false)
 	{
 		cmts = restore_user_cmts(cfunc->entry_ea);
 		if(cmts == NULL)
@@ -337,7 +337,7 @@ cexpr_t* lit_visitor_t::makeEnumExpr(const char* name, uint64 val, cexpr_t *cons
 #if IDA_SDK_VERSION < 850
 	const_t memb = get_enum_member_by_name(name);
 	if(memb == BADNODE) {
-		if(!importEnumFromTils(name, val)) 
+		if(!importEnumFromTils(name, val))
 			return NULL;
 		memb = get_enum_member_by_name(name);
 		if(memb == BADNODE)
@@ -425,7 +425,7 @@ bool lit_visitor_t::chkCallArg(cexpr_t *expr, qstring &comment)
 	lit_func_t lfunc = lit->find_func(funcname.c_str());
 	if(!lit->is_func(lfunc)) {
 		char lastChar = funcname.last();
-		if(lastChar != 'A' && lastChar != 'W') 
+		if(lastChar != 'A' && lastChar != 'W')
 			return false;
 		funcname.remove_last();
 		lfunc = lit->find_func(funcname.c_str());
@@ -469,7 +469,7 @@ bool lit_visitor_t::chkStrucMemb(cexpr_t *memb, cexpr_t *cons, qstring &comment)
 		return false;
 
 	// remove first underlining from struct typename
-	if (typeName[0] == '_') 
+	if (typeName[0] == '_')
 		typeName.remove(0, 1);
 
 	lit_struct_t ls = lit->find_struct(typeName.c_str());
@@ -479,7 +479,7 @@ bool lit_visitor_t::chkStrucMemb(cexpr_t *memb, cexpr_t *cons, qstring &comment)
 			return false;
 		typeName.remove_last();
 		ls = lit->find_struct(typeName.c_str());
-		if (!lit->is_struct(ls)) 
+		if (!lit->is_struct(ls))
 			return false;
 	}
 
@@ -550,7 +550,7 @@ bool lit_visitor_t::chkConstType(cexpr_t *expr, cexpr_t *cons, qstring &comment)
 			newExp->type = expr->type;
 			replaceExp(func, expr, newExp);
 			return true;
-		}		
+		}
 		return false;
 	}	else {
 		//TODO: add more typenames here
@@ -583,7 +583,7 @@ int idaapi lit_visitor_t::visit_expr(cexpr_t *expr)
 			cexpr_t *memb = expr->theother(cons);
 			if(memb->op == cot_memref || memb->op == cot_memptr)
 				changed |= chkStrucMemb(memb, cons, comment);
-			else 
+			else
 				changed |= chkConstType(expr, cons, comment);
 		}
 	}	else if (expr->op == cot_cast && expr->x->op == cot_num) {
@@ -652,7 +652,7 @@ bool lit_overrideTypes()
 void lit_init()
 {
 	char litfname[QMAXPATH];
-	if(getsysfile(litfname, QMAXPATH, "literal.txt", PLG_SUBDIR)) {
+	if(getPluginsFile(litfname, QMAXPATH, "literal.txt")) {
 		linput_t *litfile = open_linput(litfname, false);
 		if (litfile) {
 			lit = new literal_db();

src/warn_off.h

@@ -6,10 +6,11 @@
 #pragma GCC diagnostic ignored "-Wswitch"
 #pragma GCC diagnostic ignored "-Wpedantic"
 #pragma GCC diagnostic ignored "-Wvarargs"
+#pragma GCC diagnostic push
 #ifdef __MAC__
 #pragma GCC diagnostic ignored "-Wnullability-completeness"
+#pragma clang diagnostic ignored "-Wnontrivial-memaccess"
 #endif // __MAC__
-#pragma GCC diagnostic push
 
 //temporary fix for gcc 13.1.1 and IDA81
 #include <cstdint>