Pass SQL with zero length in trace correctly

Artyom Abakumov · Artyom Abakumov · commit 3ec5e77ed342 · 2025-09-21T17:03:35.000+03:00
diff --git a/src/jrd/trace/TraceDSQLHelpers.h b/src/jrd/trace/TraceDSQLHelpers.h
@@ -51,13 +51,14 @@ class TraceDSQLPrepare
 		if (!m_need_trace)
 			return;
 
-		m_start_clock = fb_utils::query_performance_counter();
+		m_start_clock = fb_utils::query_performance_counter();std::string_view
 
-		static const char empty_string[] = "";
-		if (!m_string_len || !string)
+		static constexpr const char* empty_string = "<empty statement>";
+		static FB_SIZE_T empty_string_length = fb_strlen(empty_string);
+		if (m_string == nullptr || (m_string_len == 0 && (m_string_len = fb_strlen(m_string)) == 0))
 		{
 			m_string = empty_string;
-			m_string_len = 0;
+			m_string_len = empty_string_length;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,14 @@ class TraceDSQLPrepare`
`51`	`51`	`if (!m_need_trace)`
`52`	`52`	`return;`
`53`	`53`
`54`		`- m_start_clock = fb_utils::query_performance_counter();`
	`54`	`+ m_start_clock = fb_utils::query_performance_counter();std::string_view`
`55`	`55`
`56`		`- static const char empty_string[] = "";`
`57`		`- if (!m_string_len \|\| !string)`
	`56`	`+ static constexpr const char* empty_string = "<empty statement>";`
	`57`	`+ static FB_SIZE_T empty_string_length = fb_strlen(empty_string);`
	`58`	`+ if (m_string == nullptr \|\| (m_string_len == 0 && (m_string_len = fb_strlen(m_string)) == 0))`
`58`	`59`	`{`
`59`	`60`	`m_string = empty_string;`
`60`		`- m_string_len = 0;`
	`61`	`+ m_string_len = empty_string_length;`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`