Skip to content

Commit 0e60f36

Browse files
committed
patches: support instrumenting dlmalloc by ASAN
The patch add a patch that implements support of AddressSanitizer in LuaJIT's dlmalloc. The work has been done by Maksim Tiushev in Tarantool Lab. By default instrumentation is disabled and it can be enabled by passing a flag LUAJIT_USE_ASAN.
1 parent ab3df30 commit 0e60f36

File tree

2 files changed

+429
-2
lines changed

2 files changed

+429
-2
lines changed

cmake/BuildLuaJIT.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ macro(build_luajit LJ_VERSION)
1313
set(CFLAGS "${CFLAGS} -fsanitize=fuzzer-no-link")
1414
set(LDFLAGS "-fsanitize=fuzzer-no-link")
1515

16-
set(LUAJIT_PATCH_PATH ${PROJECT_SOURCE_DIR}/patches/luajit-v2.1.patch)
16+
set(LUAJIT_BASEDIR ${PROJECT_SOURCE_DIR}/patches/)
1717

1818
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
1919
set(CFLAGS "${CFLAGS} ${CMAKE_C_FLAGS_DEBUG}")
@@ -99,7 +99,9 @@ macro(build_luajit LJ_VERSION)
9999
TMP_DIR ${LJ_BINARY_DIR}/tmp
100100
STAMP_DIR ${LJ_BINARY_DIR}/stamp
101101

102-
PATCH_COMMAND git reset --hard && cd <SOURCE_DIR> && patch -p1 -i ${LUAJIT_PATCH_PATH}
102+
PATCH_COMMAND git reset --hard && cd <SOURCE_DIR> &&
103+
patch -p1 -i ${LUAJIT_BASEDIR}/luajit-v2.1.patch &&
104+
patch -p1 -i ${LUAJIT_BASEDIR}/luajit-dmalloc-asan_instr-v2.1.patch
103105
CONFIGURE_COMMAND ""
104106
BUILD_COMMAND cd <SOURCE_DIR> && make -j CC=${CMAKE_C_COMPILER}
105107
CFLAGS=${CFLAGS}

0 commit comments

Comments
 (0)