diff --git a/CHANGES b/CHANGES index 2f085b8a01..c10d9f25c9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,14 @@ +3.3.0-dev.580 | 2020-11-30 14:07:39 -0700 + + * Find correct zeek namespace in debug logger macros. + + These macros forward to functionality in `zeek::detail::debug_logger` + and are not intended for customization. This patch fixes the macros to + always use `::zeek::detail::debug_logger` as without the leading `::` + lookup could happen in any potentially local namespace `zeek` which does + not need to provide this symbol. + + This closes zeek/spicy#597. (Benjamin Bannier, Corelight) 3.3.0-dev.576 | 2020-11-26 18:16:07 +0000 diff --git a/VERSION b/VERSION index ea64e30a72..b0315256e1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0-dev.576 +3.3.0-dev.580 diff --git a/src/DebugLogger.h b/src/DebugLogger.h index f7c3a04e55..736ade5aac 100644 --- a/src/DebugLogger.h +++ b/src/DebugLogger.h @@ -12,15 +12,15 @@ #include #define DBG_LOG(stream, args...) \ - if ( zeek::detail::debug_logger.IsEnabled(stream) ) \ - zeek::detail::debug_logger.Log(stream, args) + if ( ::zeek::detail::debug_logger.IsEnabled(stream) ) \ + ::zeek::detail::debug_logger.Log(stream, args) #define DBG_LOG_VERBOSE(stream, args...) \ - if ( zeek::detail::debug_logger.IsVerbose() && zeek::detail::debug_logger.IsEnabled(stream) ) \ - zeek::detail::debug_logger.Log(stream, args) -#define DBG_PUSH(stream) zeek::detail::debug_logger.PushIndent(stream) -#define DBG_POP(stream) zeek::detail::debug_logger.PopIndent(stream) + if ( ::zeek::detail::debug_logger.IsVerbose() && ::zeek::detail::debug_logger.IsEnabled(stream) ) \ + ::zeek::detail::debug_logger.Log(stream, args) +#define DBG_PUSH(stream) ::zeek::detail::debug_logger.PushIndent(stream) +#define DBG_POP(stream) ::zeek::detail::debug_logger.PopIndent(stream) -#define PLUGIN_DBG_LOG(plugin, args...) zeek::detail::debug_logger.Log(plugin, args) +#define PLUGIN_DBG_LOG(plugin, args...) ::zeek::detail::debug_logger.Log(plugin, args) ZEEK_FORWARD_DECLARE_NAMESPACED(Plugin, zeek, plugin);