summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2013-06-21 14:18:01 +0200
committerTor Didriksen <tor.didriksen@oracle.com>2013-06-21 14:18:01 +0200
commit966e1a42d9659338f00ac33da3bfdc62492df7d5 (patch)
tree660887872ddc1749213b6f8e106109c72b416740 /cmake
parent0c13218b89b434474977354f84fdcfa77c38c89f (diff)
downloadmariadb-git-966e1a42d9659338f00ac33da3bfdc62492df7d5.tar.gz
Bug#16945503 ADDRESSSANITIZER BUG IN SYS_VARS
Sys_var_keycache inherits from some variant of Sys_var_integer Instances of Sys_var_keycache are initialized using the KEYCACHE_VAR macro, which takes an offset within st_key_cache. However, the Sys_var_integer CTOR treats the offset as if it was within global_system_variables (hidden within some layers of macros and fuction pointers) The result is that we write arbitrary data to arbitrary locations in memory. This all happens during static initialization of global objects, i.e. before we have even entered the main() function. Bug#12325449 TYPO IN CMAKE/DTRACE.CMAKE Fix typo in dtrace.cmake
Diffstat (limited to 'cmake')
-rw-r--r--cmake/dtrace.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake
index 882ea0de6aa..36d948a417a 100644
--- a/cmake/dtrace.cmake
+++ b/cmake/dtrace.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -158,7 +158,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND ENABLE_DTRACE)
FOREACH(lib ${libs})
GET_TARGET_PROPERTY(libtype ${lib} TYPE)
IF(libtype MATCHES STATIC_LIBRARY)
- SET(static_libs ${static_lics} ${lib})
+ SET(static_libs ${static_libs} ${lib})
ENDIF()
ENDFOREACH()