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

Fix to MXS-279: https://mariadb.atlassian.net/browse/MXS-279

Browse Source 
Added NULL checks to block buffer initialization and checks for return values to functions that use it.
This commit is contained in:
Markus Makela
2015-09-14 16:29:14 +03:00
parent 955974d06b
commit e443351341
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
log_manager/log_manager.cc
View File

@ -771,6 +771,8 @@ static int logmanager_write_log(
wp = (char*)malloc(sizeof(char)*(timestamp_len-sizeof(char)+cmplen+str_len + 1)); wp = (char*)malloc(sizeof(char)*(timestamp_len-sizeof(char)+cmplen+str_len + 1));
} }
if(wp == NULL)
return -1;
#if defined (SS_LOG_DEBUG) #if defined (SS_LOG_DEBUG)
{ {
@ -1042,7 +1044,9 @@ static char* blockbuf_get_writepos(
/** /**
* New node is created * New node is created
*/ */
bb = blockbuf_init(id); if((bb = blockbuf_init(id)) == NULL)
return NULL;
CHK_BLOCKBUF(bb); CHK_BLOCKBUF(bb);
/** /**
@ -1128,7 +1132,9 @@ static char* blockbuf_get_writepos(
* Create the first block buffer to logfile's blockbuf list. * Create the first block buffer to logfile's blockbuf list.
*/ */
bb = blockbuf_init(id); if((bb = blockbuf_init(id)) == NULL)
return NULL;
CHK_BLOCKBUF(bb); CHK_BLOCKBUF(bb);
/** Lock buffer */ /** Lock buffer */
@ -1210,9 +1216,10 @@ static void blockbuf_node_done(
static blockbuf_t* blockbuf_init( static blockbuf_t* blockbuf_init(
logfile_id_t id) logfile_id_t id)
{ {
blockbuf_t* bb; blockbuf_t* bb;
bb = (blockbuf_t *)calloc(1, sizeof(blockbuf_t)); if ((bb = (blockbuf_t *) calloc(1, sizeof (blockbuf_t))))
{
bb->bb_fileid = id; bb->bb_fileid = id;
#if defined(SS_DEBUG) #if defined(SS_DEBUG)
bb->bb_chk_top = CHK_NUM_BLOCKBUF; bb->bb_chk_top = CHK_NUM_BLOCKBUF;
@ -1221,15 +1228,18 @@ static blockbuf_t* blockbuf_init(
simple_mutex_init(&bb->bb_mutex, "Blockbuf mutex"); simple_mutex_init(&bb->bb_mutex, "Blockbuf mutex");
bb->bb_buf_left = MAX_LOGSTRLEN; bb->bb_buf_left = MAX_LOGSTRLEN;
bb->bb_buf_size = MAX_LOGSTRLEN; bb->bb_buf_size = MAX_LOGSTRLEN;
#if defined(SS_LOG_DEBUG) #if defined(SS_LOG_DEBUG)
sprintf(bb->bb_buf,"[block:%d]",atomic_add(&block_start_index,1)); sprintf(bb->bb_buf, "[block:%d]", atomic_add(&block_start_index, 1));
bb->bb_buf_used += strlen(bb->bb_buf); bb->bb_buf_used += strlen(bb->bb_buf);
bb->bb_buf_left -= strlen(bb->bb_buf); bb->bb_buf_left -= strlen(bb->bb_buf);
#endif #endif
CHK_BLOCKBUF(bb); CHK_BLOCKBUF(bb);
return bb; }
else
{
fprintf(stderr, "Error: Memory allocation failed when initializing log manager block buffers.");
}
return bb;
} }