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

Fixes to Coverity defects.

Browse Source
This commit is contained in:
Markus Makela
2015-03-09 10:12:01 +02:00
parent 62fe3c95bb
commit f5d9c1e6df
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/adminusers.c
View File

@ -253,7 +253,9 @@ char* admin_remove_user(
/** /**
* Open passwd file and remove user from the file. * Open passwd file and remove user from the file.
*/ */
if ((home = getenv("MAXSCALE_HOME")) != NULL && strlen(home) < 1024) { if ((home = getenv("MAXSCALE_HOME")) != NULL &&
strnlen(home,PATH_MAX) < PATH_MAX &&
strnlen(home,PATH_MAX) > 0) {
sprintf(fname, "%s/etc/passwd", home); sprintf(fname, "%s/etc/passwd", home);
sprintf(fname_tmp, "%s/etc/passwd_tmp", home); sprintf(fname_tmp, "%s/etc/passwd_tmp", home);
} else { } else {

22
server/modules/routing/binlog/blr_file.c
View File

@ -71,7 +71,7 @@ static void blr_log_header(logfile_id_t file, char *msg, uint8_t *ptr);
int int
blr_file_init(ROUTER_INSTANCE *router) blr_file_init(ROUTER_INSTANCE *router)
{ {
char *ptr, path[1024], filename[1050]; char *ptr, path[1025], filename[1051];
int file_found, n = 1; int file_found, n = 1;
int root_len, i; int root_len, i;
DIR *dirp; DIR *dirp;
@ -80,12 +80,12 @@ struct dirent *dp;
if (router->binlogdir == NULL) if (router->binlogdir == NULL)
{ {
strcpy(path, "/usr/local/skysql/MaxScale"); strcpy(path, "/usr/local/skysql/MaxScale");
if ((ptr = getenv("MAXSCALE_HOME")) != NULL) if ((ptr = getenv("MAXSCALE_HOME")) != NULL && strnlen(ptr,1025) < 1025)
{ {
strncpy(path, ptr,PATH_MAX); strncpy(path, ptr,PATH_MAX);
} }
strcat(path, "/"); strncat(path, "/",1024);
strcat(path, router->service->name); strncat(path, router->service->name,1024);
if (access(path, R_OK) == -1) if (access(path, R_OK) == -1)
mkdir(path, 0777); mkdir(path, 0777);
@ -196,7 +196,7 @@ unsigned char magic[] = BINLOG_MAGIC;
fsync(fd); fsync(fd);
close(router->binlog_fd); close(router->binlog_fd);
spinlock_acquire(&router->binlog_lock); spinlock_acquire(&router->binlog_lock);
strncpy(router->binlog_name, file,BINLOG_FNAMELEN+1); strncpy(router->binlog_name, file,BINLOG_FNAMELEN);
router->binlog_position = 4; /* Initial position after the magic number */ router->binlog_position = 4; /* Initial position after the magic number */
spinlock_release(&router->binlog_lock); spinlock_release(&router->binlog_lock);
router->binlog_fd = fd; router->binlog_fd = fd;
@ -230,7 +230,7 @@ int fd;
fsync(fd); fsync(fd);
close(router->binlog_fd); close(router->binlog_fd);
spinlock_acquire(&router->binlog_lock); spinlock_acquire(&router->binlog_lock);
strncpy(router->binlog_name, file,BINLOG_FNAMELEN+1); strncpy(router->binlog_name, file,BINLOG_FNAMELEN);
router->binlog_position = lseek(fd, 0L, SEEK_END); router->binlog_position = lseek(fd, 0L, SEEK_END);
spinlock_release(&router->binlog_lock); spinlock_release(&router->binlog_lock);
router->binlog_fd = fd; router->binlog_fd = fd;
@ -290,7 +290,7 @@ blr_file_flush(ROUTER_INSTANCE *router)
BLFILE * BLFILE *
blr_open_binlog(ROUTER_INSTANCE *router, char *binlog) blr_open_binlog(ROUTER_INSTANCE *router, char *binlog)
{ {
char path[1024]; char path[1025];
BLFILE *file; BLFILE *file;
spinlock_acquire(&router->fileslock); spinlock_acquire(&router->fileslock);
@ -315,9 +315,9 @@ BLFILE *file;
file->cache = 0; file->cache = 0;
spinlock_init(&file->lock); spinlock_init(&file->lock);
strcpy(path, router->binlogdir); strncpy(path, router->binlogdir,1024);
strcat(path, "/"); strncat(path, "/",1024);
strcat(path, binlog); strncat(path, binlog,1024);
if ((file->fd = open(path, O_RDONLY, 0666)) == -1) if ((file->fd = open(path, O_RDONLY, 0666)) == -1)
{ {
@ -630,7 +630,7 @@ struct stat statb;
void void
blr_cache_response(ROUTER_INSTANCE *router, char *response, GWBUF *buf) blr_cache_response(ROUTER_INSTANCE *router, char *response, GWBUF *buf)
{ {
char path[4096], *ptr; char path[4097], *ptr;
int fd; int fd;
strcpy(path, "/usr/local/skysql/MaxScale"); strcpy(path, "/usr/local/skysql/MaxScale");

24
server/modules/routing/maxinfo/maxinfo_parse.c
View File

@ -137,35 +137,35 @@ parse_column_list(char **ptr)
int token, lookahead; int token, lookahead;
char *text, *text2; char *text, *text2;
MAXINFO_TREE *tree = NULL; MAXINFO_TREE *tree = NULL;
MAXINFO_TREE * rval = NULL;
*ptr = fetch_token(*ptr, &token, &text); *ptr = fetch_token(*ptr, &token, &text);
*ptr = fetch_token(*ptr, &lookahead, &text2); *ptr = fetch_token(*ptr, &lookahead, &text2);
switch (token) switch (token)
{ {
case LT_STRING: case LT_STRING:
free(text2);
switch (lookahead) switch (lookahead)
{ {
case LT_COMMA: case LT_COMMA:
return make_tree_node(MAXOP_COLUMNS, text, NULL, rval = make_tree_node(MAXOP_COLUMNS, text, NULL,
parse_column_list(ptr)); parse_column_list(ptr));
case LT_FROM: case LT_FROM:
return make_tree_node(MAXOP_COLUMNS, text, NULL, rval = make_tree_node(MAXOP_COLUMNS, text, NULL,
NULL); NULL);
default: default:
free(text); break;
} }
break; break;
case LT_STAR: case LT_STAR:
if (lookahead != LT_FROM)
rval = make_tree_node(MAXOP_ALL_COLUMNS, NULL, NULL,
NULL);
break;
default:
break;
}
free(text); free(text);
free(text2); free(text2);
if (lookahead != LT_FROM) return rval;
return make_tree_node(MAXOP_ALL_COLUMNS, NULL, NULL,
NULL);
default:
free(text2);
}
return NULL;
} }