Skip to content

Commit a3d8e65

Browse files
author
Artyom Abakumov
committed
Pass SQL with zero length in trace correctly
1 parent 6b73fa8 commit a3d8e65

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/jrd/trace/TraceDSQLHelpers.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
#include "../../jrd/trace/TraceManager.h"
3232
#include "../../jrd/trace/TraceObjects.h"
3333

34+
#include <string_view>
35+
3436
namespace Jrd {
3537

3638
using Firebird::ITracePlugin;
@@ -53,14 +55,12 @@ class TraceDSQLPrepare
5355

5456
m_start_clock = fb_utils::query_performance_counter();
5557

56-
static const char empty_string[] = "";
57-
if (!string)
58+
static constexpr std::string_view empty_string = "<empty statement>";
59+
if (m_string == nullptr || (m_string_len == 0 && (m_string_len = fb_strlen(m_string)) == 0))
5860
{
59-
m_string = empty_string;
60-
m_string_len = 0;
61+
m_string = empty_string.data();
62+
m_string_len = empty_string.length();
6163
}
62-
else if (m_string_len == 0)
63-
m_string_len = fb_strlen(m_string);
6464
}
6565

6666
~TraceDSQLPrepare()

0 commit comments

Comments
 (0)