fix "Add VT struct" to deal with bad/mangled/duplicate names; + few minor fixes

Author: srgblv

src/hrtng.cpp

@@ -1012,7 +1012,7 @@ ACT_DEF(var_reuse)
 	if(vi == -1)
 		return 0;
 
-	types_locator_t tl(lvars, vi);
+	types_locator_t tl(lvars, (int)vi);
 	tl.apply_to(&vu->cfunc->body, NULL);
 	if(tl.types.size() < 2) {
 		msg("[hrt] There is no stack var reusing found (%s)\n", var->name.c_str());
@@ -1633,7 +1633,7 @@ ACT_DEF(recognize_shape)
 		}
 	}
 
-	offset_locator_t ifi(lvars, vi);
+	offset_locator_t ifi(lvars, (int)vi);
 	ifi.apply_to(&vu.cfunc->body, NULL);
 
 	structs_shape_t rs(offset);
@@ -1893,13 +1893,16 @@ static bool is_cast_assign(cfuncptr_t cfunc, cexpr_t * var, tinfo_t * ts)
 	} else if(asg->x != var)
 		return false;
 
-	if(ts) {
-		cexpr_t* y = skipCast(asg->y);
-		tinfo_t yType = y->type; //??? use getExpType(cfunc_t *func, cexpr_t* exp)
-		if(bDerefPtr)
-			yType = make_pointer(yType);
+	cexpr_t* y = skipCast(asg->y);
+	tinfo_t yType = y->type; //??? use getExpType(cfunc_t *func, cexpr_t* exp)
+	if(bDerefPtr)
+		yType = make_pointer(yType);
+
+	if(asg->x->type == yType)
+		return false;
+
+	if(ts)
 		*ts = yType;
-	}
 	return true;
 }
 
@@ -5317,7 +5320,7 @@ plugmod_t*
 	addon.producer = "Sergey Belov and Milan Bohacek, Rolf Rolles, Takahiro Haruyama," \
 									 " Karthik Selvaraj, Ali Rahbar, Ali Pezeshk, Elias Bachaalany, Markus Gaasedelen";
 	addon.url = "https://github.com/KasperskyLab/hrtng";
-	addon.version = "2.3.24";
+	addon.version = "2.3.25";
 	register_addon(&addon);	
 
 	return PLUGIN_KEEP;

src/opt.cpp

@@ -936,7 +936,7 @@ bool TraceAndExtractOpsMovAndSubBy1(mblock_t* blk, mop_t*& opMov, mop_t*& opSub,
 			return 0;
 		}
 		MSG_DO(("[I] call_ARITH_2const: '%s'", call->dstr()));
-		op->make_number(res, fi->return_type.get_size());
+		op->make_number(res, (int)fi->return_type.get_size());
 		return 1;
 	}
 
@@ -986,7 +986,7 @@ bool TraceAndExtractOpsMovAndSubBy1(mblock_t* blk, mop_t*& opMov, mop_t*& opSub,
 		if(opcode == m_ret) {
 			if(!op)
 				return 0;
-			op->make_number(n, fi->return_type.get_size());
+			op->make_number(n, (int)fi->return_type.get_size());
 		} else {
 			if(fi->args.size() < 1)
 				return 0;
@@ -1001,7 +1001,7 @@ bool TraceAndExtractOpsMovAndSubBy1(mblock_t* blk, mop_t*& opMov, mop_t*& opSub,
 				ins->l.make_reg(reg2mreg(R_ds), 2); //FIXME: x86 specific!
 			} else {
 				ins->l = fi->args.front();
-				ins->r.make_number(n, fi->return_type.get_size());
+				ins->r.make_number(n, (int)fi->return_type.get_size());
 			}
 			ins->opcode = opcode;
 		}

src/structures.cpp

@@ -563,8 +563,9 @@ tid_t create_VT_struc(ea_t VT_ea, const char * basename, uval_t idx /*= BADADDR*
 		if(has_user_name(get_flags(VT_ea))) {
 			name_vt = get_name(VT_ea);
 			if(name_vt.length() > 9 && !strncmp(name_vt.c_str(), "??_7", 4)) {
+				//remove everything except main class name
 				name_vt.remove(0, 4);
-				name_vt.remove(name_vt.find("@@6B@"), 5); //"@@6B@" on the end may be followed by "_0" suffix
+				name_vt = name_vt.substr(0, name_vt.find("@@6B"));
 			}
 			if(!strnicmp(name_vt.c_str(), "vtbl_", 5))
 				name_vt.remove(0, 5);
@@ -593,9 +594,11 @@ tid_t create_VT_struc(ea_t VT_ea, const char * basename, uval_t idx /*= BADADDR*
 
 #if IDA_SDK_VERSION < 900
 	tid_t newid = get_struc_id(name_vt.c_str());
-	if (newid == BADADDR)
+	if (newid != BADADDR) {
+		warning("[hrt] struct '%s' already exist,\n rename VTBL global name or remove/rename conflicting type and try again\n", name_vt.c_str());
+		return BADNODE;
+	}
 		newid = add_struc(idx, name_vt.c_str());
-
 	if (newid == BADADDR) {
 		msg("[hrt] add_struc(%d, \"%s\") failed\n", idx, name_vt.c_str());
 		return BADNODE;
@@ -607,18 +610,21 @@ tid_t create_VT_struc(ea_t VT_ea, const char * basename, uval_t idx /*= BADADDR*
 	set_struc_cmt(newid, struccmt.c_str(), true);
 #else //IDA_SDK_VERSION >= 900
 	tid_t newid = get_named_type_tid(name_vt.c_str());
+	if (newid != BADADDR) {
+		warning("[hrt] type '%s' already exist,\n rename VTBL global name or remove/rename conflicting type and try again\n", name_vt.c_str());
+		return BADNODE;
+	}
+
 	tinfo_t newstruc;
-	if (newid == BADADDR) {
 		udt_type_data_t s;
+	tinfo_code_t err = TERR_BAD_TYPE;
 		s.taudt_bits |= TAUDT_UNALIGNED;
 		s.set_vftable(true);
-		if(!newstruc.create_udt(s) || newstruc.set_named_type(NULL, name_vt.c_str()) != TERR_OK)
-			return BADNODE;
-		newid = newstruc.get_tid();
-	}	else {
-		if(!get_type_by_tid(&newstruc, newid) || !newstruc.is_decl_struct())
+	if (!newstruc.create_udt(s) || (err = newstruc.set_named_type(NULL, name_vt.c_str())) != TERR_OK) {
+		msg("[hrt] error %d (%s) on create vtbl stuct\n", err, tinfo_errstr(err));
 			return BADNODE;
 	}
+	newid = newstruc.get_tid();
 	newstruc.set_type_cmt(struccmt.c_str());
 
 	// actually set_vftable_ea is appeared in ida 7.6 but here will be used from ida9 becouse it probably depends on TAUDT_VFTABLE flag has been set few lines above