firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 15:23:02 +01:00
Code Issues

Fixed CORE-4506: Firebird server crashes when execute most of "show ..." commands after reconnect

Browse Source
This commit is contained in:
alexpeshkoff 2014-08-19 09:53:42 +00:00
parent 2945afd7f1
commit 0822c657d8
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gpre/obj_cxx.cpp
View File

@ -3024,6 +3024,9 @@ static void gen_s_start( const act* action, int column)
{
gpre_req* request = action->act_request;
printa(column, "for (int retries = 0; retries < 2; ++retries)");
column += INDENT;
begin(column);
gen_compile(action, column);
gpre_port* port = request->req_vport;
@ -3038,12 +3041,17 @@ static void gen_s_start( const act* action, int column)
make_ok_test(action, request, column);
column += INDENT;
}
gen_start(action, port, column, false);
if (action->act_error || (action->act_flags & ACT_sql))
column -= INDENT;
const TEXT* pattern1 = "if (%V1->get()[1] == isc_bad_req_handle) %RH = NULL;";
PAT args;
args.pat_request = action->act_request;
args.pat_vector1 = status_vector(action);
PATTERN_expand((USHORT) column, pattern1, &args);
printa(column, "else break;");
if (action->act_type == ACT_open)
{
endp(column);
@ -3052,6 +3060,8 @@ static void gen_s_start( const act* action, int column)
column -= INDENT;
}
endp(column);
column -= INDENT;
set_sqlcode(action, column);
}