diff --git a/src/jrd/trace/TraceDSQLHelpers.h b/src/jrd/trace/TraceDSQLHelpers.h index e425518d45b..0f8447ddfb4 100644 --- a/src/jrd/trace/TraceDSQLHelpers.h +++ b/src/jrd/trace/TraceDSQLHelpers.h @@ -53,11 +53,13 @@ class TraceDSQLPrepare m_start_clock = fb_utils::query_performance_counter(); - static const char empty_string[] = ""; - if (!string) + if (m_string == nullptr || (m_string_len == 0 && (m_string_len = fb_strlen(m_string)) == 0)) { + static constexpr const char* empty_string = ""; + static FB_SIZE_T empty_string_length = fb_strlen(empty_string); + m_string = empty_string; - m_string_len = 0; + m_string_len = empty_string_length; } else if (m_string_len == 0) m_string_len = fb_strlen(m_string);