Merge pull request #1 from Microsoft/master

Update vcpkg from upstream

1 files changed, 29 insertions, 0 deletions

diff --git a/ports/libdisasm/sizeofvoid.patch b/ports/libdisasm/sizeofvoid.patch
new file mode 100644
index 000000000..428c5616c
--- /dev/null
+++ b/ports/libdisasm/sizeofvoid.patch
@@ -0,0 +1,29 @@
+diff --git a/x86_disasm.c b/x86_disasm.c
+index 04574fa..177bfb8 100644
+--- a/x86_disasm.c
++++ b/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));
+                 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;
+ 	}