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

Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop

Browse Source
This commit is contained in:
VilhoRaatikka
2014-10-30 21:20:32 +02:00
parent 5b80cf3032 41f016df18
commit e739f3501b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/dbusers.c
View File

@ -897,6 +897,10 @@ static void *uh_keydup(void* key) {
MYSQL_USER_HOST *current_key = (MYSQL_USER_HOST *)key; MYSQL_USER_HOST *current_key = (MYSQL_USER_HOST *)key;
if (key == NULL || rval == NULL || current_key == NULL || current_key->user == NULL) { if (key == NULL || rval == NULL || current_key == NULL || current_key->user == NULL) {
if (rval) {
free(rval);
}
return NULL; return NULL;
} }

2
server/core/gw_utils.c
View File

@ -175,7 +175,7 @@ void gw_daemonize(void) {
int int
parse_bindconfig(char *config, unsigned short def_port, struct sockaddr_in *addr) parse_bindconfig(char *config, unsigned short def_port, struct sockaddr_in *addr)
{ {
char *port, buf[1024]; char *port, buf[1024 + 1];
short pnum; short pnum;
struct hostent *hp; struct hostent *hp;