Skip to content

Correction for passing zero-length SQL to trace #8748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: v5.0-release
Choose a base branch
from
Open

Correction for passing zero-length SQL to trace #8748

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ec5e77
Pass SQL with zero length in trace correctly
Sep 20, 2025
c6ae7a7
Add forgotten change
Sep 21, 2025
91b975d
Calculate size only when empty sql is encountered
Sep 21, 2025
b7e80a9
Merge branch 'v5.0-release' into v5_zero_length_sql_in_trace
Noremos Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/jrd/trace/TraceDSQLHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<empty statement>";
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);
Expand Down
Loading