Skip to content

Postfix for #8430 #8752

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

Postfix for #8430 #8752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
700f474
Fixed crash after calling incorrectly parametrized request
Ev3nt Jul 23, 2025
5e1ecff
Patch: Fixed crash after calling incorrectly parametrized request
Ev3nt Jul 24, 2025
22c7d12
Merge branch 'FirebirdSQL:v5.0-release' into v5.0-release
Ev3nt Sep 22, 2025
24c74e1
ALICE_print fix, isError flag added
Sep 22, 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
12 changes: 9 additions & 3 deletions src/alice/alice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ int alice(Firebird::UtilSvc* uSvc)

if (any_error)
{
ALICE_print(24); // msg 24: Summary of validation errors\n
ALICE_print(24, SafeArg(), false); // msg 24: Summary of validation errors\n

for (int i = 0; i < MAX_VAL_ERRORS; ++i)
{
Expand Down Expand Up @@ -637,13 +637,19 @@ void ALICE_upper_case(const TEXT* in, TEXT* out, const size_t buf_size)
// Display a formatted error message
//

void ALICE_print(USHORT number, const SafeArg& arg)
void ALICE_print(USHORT number, const SafeArg& arg, const bool isError)
{
AliceGlobals* tdgbl = AliceGlobals::getSpecific();
if (tdgbl->uSvc->isService())
{
if (!isError)
tdgbl->uSvc->started();

tdgbl->uSvc->getStatusAccessor().setServiceStatus(ALICE_MSG_FAC, number, arg);
tdgbl->uSvc->started();

if (isError)
tdgbl->uSvc->started();

return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/alice/alice_proto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ int alice(Firebird::UtilSvc*);
class AliceGlobals;

void ALICE_upper_case(const TEXT*, TEXT*, const size_t);
void ALICE_print(USHORT, const MsgFormat::SafeArg& arg = MsgFormat::SafeArg());
void ALICE_print(USHORT, const MsgFormat::SafeArg& arg = MsgFormat::SafeArg(), const bool isError = true);
void ALICE_error(USHORT, const MsgFormat::SafeArg& arg = MsgFormat::SafeArg());
void ALICE_print_status(bool error, const ISC_STATUS*);
void ALICE_exit(int, AliceGlobals*);
Expand Down
Loading