From 2f15ffd6b5beef9abd501c594bc3cb38c2683f77 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Fri, 2 Jul 2010 04:55:28 +0000 Subject: NULL dereference fixes in code base after running with 'clang' * 212 logical (NULL deref/divide by zero) errors reduced to 28 (27 of them in contrib/ and lex part of codebase, 1 is invalid) * 11 API errors reduced to 0 Signed-off-by: Amar Tumballi Signed-off-by: Anand V. Avati BUG: 966 (NULL check for avoiding NULL dereferencing of pointers..) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=966 --- xlators/protocol/server/src/server-helpers.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'xlators/protocol/server/src/server-helpers.c') diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index 11c489e8867..216204a8ba0 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -541,15 +541,17 @@ server_connection_destroy (xlator_t *this, server_connection_t *conn) INIT_LIST_HEAD (&file_lockers); INIT_LIST_HEAD (&dir_lockers); - LOCK (<able->lock); - { - list_splice_init (<able->file_lockers, - &file_lockers); + if (ltable) { + LOCK (<able->lock); + { + list_splice_init (<able->file_lockers, + &file_lockers); - list_splice_init (<able->dir_lockers, &dir_lockers); + list_splice_init (<able->dir_lockers, &dir_lockers); + } + UNLOCK (<able->lock); + GF_FREE (ltable); } - UNLOCK (<able->lock); - GF_FREE (ltable); flock.l_type = F_UNLCK; flock.l_start = 0; @@ -1030,7 +1032,7 @@ server_print_params (char *str, int size, server_state_t *state) "wbflags=%d,", state->wbflags); if (state->size) filled += snprintf (str + filled, size - filled, - "size=%Zu,", state->size); + "size=%zu,", state->size); if (state->offset) filled += snprintf (str + filled, size - filled, "offset=%"PRId64",", state->offset); -- cgit