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

Fixed bug CORE-2781 : AV in fbtracemgr when command line swithes set wrongly

Browse Source
This commit is contained in:
hvlad 2009-12-01 14:45:20 +00:00
parent 7d22c2674d
commit eca2c62138
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/jrd/trace/TraceCmdLine.cpp
View File

@ -225,7 +225,7 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
usage(uSvc, isc_trace_switch_once, sw->in_sw_name); usage(uSvc, isc_trace_switch_once, sw->in_sw_name);
argv++; argv++;
if (argv < end) if (argv < end && *argv)
session.ses_config = *argv; session.ses_config = *argv;
else else
usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name); usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name);
@ -246,7 +246,7 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
usage(uSvc, isc_trace_switch_once, sw->in_sw_name); usage(uSvc, isc_trace_switch_once, sw->in_sw_name);
argv++; argv++;
if (argv < end) if (argv < end && *argv)
session.ses_name = *argv; session.ses_name = *argv;
else else
usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name); usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name);
@ -265,7 +265,7 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
usage(uSvc, isc_trace_switch_once, sw->in_sw_name); usage(uSvc, isc_trace_switch_once, sw->in_sw_name);
argv++; argv++;
if (argv < end) if (argv < end && *argv)
{ {
session.ses_id = atol(*argv); session.ses_id = atol(*argv);
if (!session.ses_id) if (!session.ses_id)
@ -304,7 +304,7 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
usage(uSvc, isc_trace_switch_once, sw->in_sw_name); usage(uSvc, isc_trace_switch_once, sw->in_sw_name);
argv++; argv++;
if (argv < end) if (argv < end && *argv)
user = *argv; user = *argv;
else else
usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name); usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name);
@ -315,7 +315,7 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
usage(uSvc, isc_trace_switch_once, sw->in_sw_name); usage(uSvc, isc_trace_switch_once, sw->in_sw_name);
argv++; argv++;
if (argv < end) if (argv < end && *argv)
pwd = *argv; pwd = *argv;
else else
usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name); usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name);
@ -329,7 +329,7 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
usage(uSvc, isc_trace_switch_once, sw->in_sw_name); usage(uSvc, isc_trace_switch_once, sw->in_sw_name);
argv++; argv++;
if (argv < end) if (argv < end && *argv)
{ {
const PathName fileName(*argv); const PathName fileName(*argv);
const char *s = NULL; const char *s = NULL;
@ -370,7 +370,7 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
usage(uSvc, isc_trace_switch_once, sw->in_sw_name); usage(uSvc, isc_trace_switch_once, sw->in_sw_name);
argv++; argv++;
if (argv < end) if (argv < end && *argv)
user = *argv; user = *argv;
else else
usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name); usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name);
@ -391,7 +391,7 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
usage(uSvc, isc_trace_switch_once, sw->in_sw_name); usage(uSvc, isc_trace_switch_once, sw->in_sw_name);
argv++; argv++;
if (argv < end) if (argv < end && *argv)
svc_name = *argv; svc_name = *argv;
else else
usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name); usage(uSvc, isc_trace_param_val_miss, sw->in_sw_name);