From 7655ccebd46936a42a6edb62184455077a6505fd Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Tue, 21 Sep 2010 22:22:45 +0000 Subject: server-helper: check for conf before dereferencing Signed-off-by: Amar Tumballi Signed-off-by: Vijay Bellur BUG: 1667 () URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1667 --- xlators/protocol/server/src/server-helpers.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xlators') diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index 85d157f5f8a..3dbd007ce99 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -1108,7 +1108,7 @@ server_print_reply (call_frame_t *frame, int op_ret, int op_errno) this = frame->this; conf = this->private; - if (!conf->trace) + if (!conf || !conf->trace) return; state = CALL_STATE (frame); @@ -1153,11 +1153,11 @@ server_print_request (call_frame_t *frame) this = frame->this; conf = this->private; - state = CALL_STATE (frame); - - if (!conf->trace) + if (!conf || !conf->trace) return; + state = CALL_STATE (frame); + memset (resolve_vars, '\0', 256); memset (resolve2_vars, '\0', 256); memset (loc_vars, '\0', 256); -- cgit