diff options
author | Boris Nagaev <bnagaev@gmail.com> | 2016-06-05 12:25:11 (GMT) |
---|---|---|
committer | Boris Nagaev <bnagaev@gmail.com> | 2016-06-05 12:25:11 (GMT) |
commit | d285dcb26d53e47dd89db8ef3f8fd7159d049842 (patch) | |
tree | fd5827e2bb4adae5725b06f1f906f9fa3a0145d6 | |
parent | 057a4228b31184fd227f6a2f14b12bb8c685fdea (diff) | |
download | mxe-d285dcb26d53e47dd89db8ef3f8fd7159d049842.zip mxe-d285dcb26d53e47dd89db8ef3f8fd7159d049842.tar.gz mxe-d285dcb26d53e47dd89db8ef3f8fd7159d049842.tar.bz2 |
hyperscan: fix crash in aligned_zmalloc
aligned_zmalloc backed by posix_* functions causes crash in native Windows
(and not in wine) with the following traceback:
https://i.imgur.com/FBHPgvn.png
-rw-r--r-- | src/hyperscan-1-fixes.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/hyperscan-1-fixes.patch b/src/hyperscan-1-fixes.patch index e545176..5df08e5 100644 --- a/src/hyperscan-1-fixes.patch +++ b/src/hyperscan-1-fixes.patch @@ -6090,28 +6090,6 @@ index 1111111..2222222 100644 #ifndef likely #define likely(x) __builtin_expect(!!(x), 1) #endif -diff --git a/src/util/alloc.cpp b/src/util/alloc.cpp -index 1111111..2222222 100644 ---- a/src/util/alloc.cpp -+++ b/src/util/alloc.cpp -@@ -61,7 +61,7 @@ namespace ue2 { - - void *aligned_malloc_internal(size_t size, size_t align) { - void *mem; --#if !defined(_WIN32) -+#if !NATIVE_WIN32 - int rv = posix_memalign(&mem, align, size); - if (rv != 0) { - DEBUG_PRINTF("posix_memalign returned %d when asked for %zu bytes\n", -@@ -85,7 +85,7 @@ void aligned_free_internal(void *ptr) { - return; - } - --#if defined(_WIN32) -+#if NATIVE_WIN32 - _aligned_free(ptr); - #else - free(ptr); diff --git a/src/util/bitutils.h b/src/util/bitutils.h index 1111111..2222222 100644 --- a/src/util/bitutils.h |