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

Merge branch 'release-1.2' into MXS-230

Browse Source
This commit is contained in:
Markus Makela
2015-07-13 13:27:11 +03:00
parent 056ad50458 584ad321ff
commit 93e557d8be
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/dbusers.c
View File

@ -210,7 +210,7 @@ HASHTABLE *oldresources;
oldusers = service->users; oldusers = service->users;
/* digest compare */ /* digest compare */
if (memcmp(oldusers->cksum, newusers->cksum, SHA_DIGEST_LENGTH) == 0) { if (oldusers != NULL && memcmp(oldusers->cksum, newusers->cksum, SHA_DIGEST_LENGTH) == 0) {
/* same data, nothing to do */ /* same data, nothing to do */
LOGIF(LD, (skygw_log_write_flush( LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG, LOGFILE_DEBUG,
@ -234,7 +234,7 @@ HASHTABLE *oldresources;
spinlock_release(&service->spin); spinlock_release(&service->spin);
if (i) { if (i && oldusers) {
/* free the old table */ /* free the old table */
users_free(oldusers); users_free(oldusers);
} }