libdisasm: Don't depend on sizeof(void)

src/third_party/libdisasm/x86_disasm.c

Index: src/third_party/libdisasm/x86_disasm.c
diff --git a/src/third_party/libdisasm/x86_disasm.c b/src/third_party/libdisasm/x86_disasm.c
index 51a213a46e33ed251e3f10dad9fc402ed27c0ccf..1b82f4e667125c4f5593b24e65d8cc6a79c86fad 100644
--- a/src/third_party/libdisasm/x86_disasm.c
+++ b/src/third_party/libdisasm/x86_disasm.c
@@ -35,7 +35,7 @@ unsigned int x86_disasm( unsigned char *buf, unsigned int buf_len,
 
         if ( offset >= buf_len ) {
                 /* another caller screwup ;) */
-                x86_report_error(report_disasm_bounds, (void*)(long)buf_rva+offset);
+                x86_report_error(report_disasm_bounds, (void*)(long)(buf_rva+offset));

[brucedawson, 2016/01/08 21:19:11]

Too late for this change, but why are we casting to 'long' here? My guess is
that it is an attempt to convert from uint32_t to pointer-sized integer, but
'long' is not a reliable way to do this since 'long' is always 32-bit on VC++.
The cast to long should be removed or replaced with a cast to intptr_t or,
probably best of all, uintptr_t.

                 return 0;
         }
 
@@ -53,13 +53,13 @@ unsigned int x86_disasm( unsigned char *buf, unsigned int buf_len,
 
         /* check and see if we had an invalid instruction */
         if (! size ) {
-                x86_report_error(report_invalid_insn, (void*)(long)buf_rva+offset );
+                x86_report_error(report_invalid_insn, (void*)(long)(buf_rva+offset));
                 return 0;
         }
 
         /* check if we overran the end of the buffer */
         if ( size > len ) {
-                x86_report_error( report_insn_bounds, (void*)(long)buf_rva + offset );
+                x86_report_error( report_insn_bounds, (void*)(long)(buf_rva + offset));
 		MAKE_INVALID( insn, bytes );
 		return 0;
 	}