Fix format strings bug found by @shuffle2

filcab · filcab · commit db6edf37f4ec · 2015-04-09T19:12:56.000+01:00
We don't need PRIea_t, since IDA already provides %a
diff --git a/backup.cpp b/backup.cpp
@@ -267,7 +267,7 @@ static size_t singleton_unserialize(char * buf, size_t blen, psig_t ** s, int ve
 			buffer_unserialize_string(buf, blen, &pos, &(*s)->name);
 		else
 		{
-			qsnprintf(tmp, sizeof(tmp), "sub_%" PRIea_t, (*s)->startEA);
+			qsnprintf(tmp, sizeof(tmp), "sub_%a", (*s)->startEA);
 			sig_set_name((*s), tmp);
 		}
 	}
diff --git a/display.cpp b/display.cpp
@@ -107,8 +107,8 @@ static void idaapi desc_dlist(slist_t * sl,uint32 n,char * const *arrptr)
 		qsnprintf(arrptr[0], MAXSTR, "%u", sig->mtype);
 		qsnprintf(arrptr[1], MAXSTR, "%s", sig->name);
 		qsnprintf(arrptr[2], MAXSTR, "%s", sig->msig->name);
-		qsnprintf(arrptr[3], MAXSTR, "%" PRIea_t, sig->startEA);
-		qsnprintf(arrptr[4], MAXSTR, "%" PRIea_t, sig->msig->startEA);
+		qsnprintf(arrptr[3], MAXSTR, "%a", sig->startEA);
+		qsnprintf(arrptr[4], MAXSTR, "%a", sig->msig->startEA);
 		qsnprintf(arrptr[5], MAXSTR, "%c", sig->id_crc ? '+' : '-');
 		qsnprintf(arrptr[6], MAXSTR, "%lx", sig->crc_hash);
 		qsnprintf(arrptr[7], MAXSTR, "%lx", sig->msig->crc_hash);
@@ -162,7 +162,7 @@ static void idaapi desc_unmatch(void *obj,uint32 n,char * const *arrptr)
 		psig_t *sig = ui_access_sig(((deng_t *)obj)->ulist, n);
 		qsnprintf(arrptr[0], MAXSTR, "%u", sig->nfile);
 		qsnprintf(arrptr[1], MAXSTR, "%s", sig->name);
-		qsnprintf(arrptr[2], MAXSTR, "%" PRIea_t, sig->startEA);
+		qsnprintf(arrptr[2], MAXSTR, "%a", sig->startEA);
 		qsnprintf(arrptr[3], MAXSTR, "%.8lX", sig->sig);
 		qsnprintf(arrptr[4], MAXSTR, "%.8lX", sig->hash);
 		qsnprintf(arrptr[5], MAXSTR, "%.8lX", sig->crc_hash);
@@ -486,7 +486,7 @@ static uint32 idaapi res_match(void *obj,uint32 n)
 			return 1;
 		}
 
-		warning("Address '%" PRIea_t "' is not valid.", ea);
+		warning("Address '%a' is not valid.", ea);
 		return 0;
 	}
 
diff --git a/patchdiff.cpp b/patchdiff.cpp
@@ -148,7 +148,7 @@ static void run_second_instance(const char * options)
 	bool cont;
 	char tmp[QMAXPATH*4];
 	
-	qsscanf(options, "%lu:%" PRIea_t ":%u:%s", &id, &ea, &v, file);
+	qsscanf(options, "%lu:%a:%u:%s", &id, &ea, &v, file);
 	opt = (unsigned char)v;
 	
 	if (id)
diff --git a/precomp.hpp b/precomp.hpp
@@ -48,10 +48,3 @@
 
 static_assert(IDA_SDK_VERSION == 650, "This plugin expects IDA SDK 6.5");
 
-
-// Define PRIea_t like the PRI family of constants
-#ifdef __EA64__
-#define PRIea_t "llx"
-#else
-#define PRIea_t "x"
-#endif
diff --git a/sig.cpp b/sig.cpp
@@ -538,7 +538,7 @@ int dline_add(dline_t * dl, ea_t ea, char options)
 
 	if (options)
 	{
-		qsnprintf(addr, sizeof(addr), "%" PRIea_t, ea);
+		qsnprintf(addr, sizeof(addr), "%a", ea);
 		out_snprintf("%s ", addr);
 	}
 
@@ -795,7 +795,7 @@ psig_t * sig_class_generate(ea_t ea)
 	sig_set_start(sig, ea);
 
 	// Adds function name
-	qsnprintf(buf, sizeof(buf), "sub_%" PRIea_t, ea);
+	qsnprintf(buf, sizeof(buf), "sub_%a", ea);
 	sig_set_name(sig, buf);
 
 	// Adds class references
diff --git a/system.cpp b/system.cpp
@@ -66,7 +66,7 @@ static int system_execute_second_instance(char * idc, ea_t ea, char * file, bool
 	if (generate_idc_file(idc))
 		return -1;
 
-	qsnprintf(cmd, sizeof(cmd), "\"%s\" -A -S\"%s\" -Opatchdiff2:%ld:%" PRIea_t ":%u:\"%s\" \"%s\"",
+	qsnprintf(cmd, sizeof(cmd), "\"%s\" -A -S\"%s\" -Opatchdiff2:%ld:%a:%u:\"%s\" \"%s\"",
 									path,
 									idc,
 									id,
@@ -227,7 +227,7 @@ static void ipc_execute_second_instance(char * idc, ea_t ea, char * file)
 	if (!ipc_init(file, 1, 0))
 		return;
 
-	qsnprintf(cmd, sizeof(cmd), "%u:%" PRIea_t ":%u:%s",
+	qsnprintf(cmd, sizeof(cmd), "%u:%a:%u:%s",
 									0,
 									ea,
 									dto.graph.s_showpref,

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ static size_t singleton_unserialize(char * buf, size_t blen, psig_t ** s, int ve`
`267`	`267`	`buffer_unserialize_string(buf, blen, &pos, &(*s)->name);`
`268`	`268`	`else`
`269`	`269`	`{`
`270`		`- qsnprintf(tmp, sizeof(tmp), "sub_%" PRIea_t, (*s)->startEA);`
	`270`	`+ qsnprintf(tmp, sizeof(tmp), "sub_%a", (*s)->startEA);`
`271`	`271`	`sig_set_name((*s), tmp);`
`272`	`272`	`}`
`273`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -538,7 +538,7 @@ int dline_add(dline_t * dl, ea_t ea, char options)`
`538`	`538`
`539`	`539`	`if (options)`
`540`	`540`	`{`
`541`		`- qsnprintf(addr, sizeof(addr), "%" PRIea_t, ea);`
	`541`	`+ qsnprintf(addr, sizeof(addr), "%a", ea);`
`542`	`542`	`out_snprintf("%s ", addr);`
`543`	`543`	`}`
`544`	`544`
`@@ -795,7 +795,7 @@ psig_t * sig_class_generate(ea_t ea)`
`795`	`795`	`sig_set_start(sig, ea);`
`796`	`796`
`797`	`797`	`// Adds function name`
`798`		`- qsnprintf(buf, sizeof(buf), "sub_%" PRIea_t, ea);`
	`798`	`+ qsnprintf(buf, sizeof(buf), "sub_%a", ea);`
`799`	`799`	`sig_set_name(sig, buf);`
`800`	`800`
`801`	`801`	`// Adds class references`