hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to Coveriry issues 72757 & 73266

Browse Source
This commit is contained in:
VilhoRaatikka
2014-11-07 10:07:22 +02:00
parent 1ed3c9cc62
commit 4f39828fa1
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
log_manager/log_manager.cc
View File

@ -423,9 +423,17 @@ static bool logmanager_init_nomutex(
return_succp: return_succp:
if (err != 0) if (err != 0)
{ {
skygw_message_done(lm->lm_clientmes); if (lm != NULL)
skygw_message_done(lm->lm_logmes); {
if (lm->lm_clientmes != NULL)
{
skygw_message_done(lm->lm_clientmes);
}
if (lm->lm_logmes != NULL)
{
skygw_message_done(lm->lm_logmes);
}
}
/** This releases memory of all created objects */ /** This releases memory of all created objects */
logmanager_done_nomutex(); logmanager_done_nomutex();
fprintf(stderr, "*\n* Error : Initializing log manager failed.\n*\n"); fprintf(stderr, "*\n* Error : Initializing log manager failed.\n*\n");
@ -1895,15 +1903,18 @@ static char* form_full_file_name(
fprintf(stderr, "Error : Too long file name= %d.\n", (int)fnlen); fprintf(stderr, "Error : Too long file name= %d.\n", (int)fnlen);
goto return_filename; goto return_filename;
} }
filename = (char*)calloc(1, fnlen); filename = (char*)calloc(1, fnlen);
snprintf(seqnostr, s+1, "%d", seqno);
if (seqnostr != NULL)
{
snprintf(seqnostr, s+1, "%d", seqno);
}
for (i=0, p=parts; p->sp_string != NULL; i++, p=p->sp_next) for (i=0, p=parts; p->sp_string != NULL; i++, p=p->sp_next)
{ {
if (i == seqnoidx) if (seqnostr != NULL && i == seqnoidx)
{ {
strcat(filename, seqnostr); strcat(filename, seqnostr); /*< add sequence number */
} }
strcat(filename, p->sp_string); strcat(filename, p->sp_string);