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

Yet another 1-char-off bug in log_manager

Browse Source
This commit is contained in:
VilhoRaatikka
2014-11-27 19:33:20 +02:00
parent 3e18e091c1
commit e068614651
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
log_manager/log_manager.cc
View File

@ -741,13 +741,13 @@ static int logmanager_write_log(
timestamp_len = get_timestamp_len(); timestamp_len = get_timestamp_len();
/** Find out how much can be safely written with current block size */ /** Find out how much can be safely written with current block size */
if (timestamp_len-1+sesid_str_len-1+str_len > lf->lf_buf_size) if (timestamp_len-1+MAX(sesid_str_len-1,0)+str_len > lf->lf_buf_size)
{ {
safe_str_len = lf->lf_buf_size; safe_str_len = lf->lf_buf_size;
} }
else else
{ {
safe_str_len = timestamp_len-1+sesid_str_len-1+str_len; safe_str_len = timestamp_len-1+MAX(sesid_str_len-1,0)+str_len;
} }
/** /**
* Seek write position and register to block buffer. * Seek write position and register to block buffer.
@ -809,10 +809,6 @@ static int logmanager_write_log(
sesid_str_len, sesid_str_len,
"[%lu] ", "[%lu] ",
tls_log_info.li_sesid); tls_log_info.li_sesid);
}
if (sesid_str_len != 0)
{
sesid_str_len -= 1; /*< don't calculate terminating char anymore */ sesid_str_len -= 1; /*< don't calculate terminating char anymore */
} }
/** /**