Merge branch 'release-1.2' into develop

Conflicts: server/core/dbusers.c
2015-07-13 15:52:36 +03:00
parent 6c5c88ccf0 2453b808cf
commit 0134fdc397
11 changed files with 175 additions and 121 deletions
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@ -210,7 +210,7 @@ HASHTABLE	*oldresources;
 	oldusers = service->users;

 	/* digest compare */
-	if (oldusers && 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 */
 		LOGIF(LD, (skygw_log_write_flush(
 			LOGFILE_DEBUG,