diff options
| author | Amar Tumballi <amar@gluster.com> | 2010-07-02 04:55:28 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-07-02 05:17:03 -0700 |
| commit | 2f15ffd6b5beef9abd501c594bc3cb38c2683f77 (patch) | |
| tree | 107176560e1a97c42f3535380ef49d4dee3b0cd6 /xlators/protocol/legacy/server/src/server-protocol.c | |
| parent | 3dc79ca8e6119f5ff61058cc87f9a4fc251017ef (diff) | |
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 <amar@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 966 (NULL check for avoiding NULL dereferencing of pointers..)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=966
Diffstat (limited to 'xlators/protocol/legacy/server/src/server-protocol.c')
| -rw-r--r-- | xlators/protocol/legacy/server/src/server-protocol.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/xlators/protocol/legacy/server/src/server-protocol.c b/xlators/protocol/legacy/server/src/server-protocol.c index 6a48dff39..da0303019 100644 --- a/xlators/protocol/legacy/server/src/server-protocol.c +++ b/xlators/protocol/legacy/server/src/server-protocol.c @@ -147,7 +147,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); @@ -667,8 +667,8 @@ server_fentrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, gf_errno = gf_errno_to_error (op_errno); hdr->rsp.op_errno = hton32 (gf_errno); + state = CALL_STATE(frame); if (op_ret >= 0) { - state = CALL_STATE(frame); if (state->cmd == ENTRYLK_UNLOCK) gf_del_locker (conn->ltable, state->volume, NULL, state->fd, frame->root->pid); @@ -5656,7 +5656,7 @@ mop_setvolume (call_frame_t *frame, xlator_t *bound_xl, fail: dict_len = dict_serialized_length (reply); if (dict_len < 0) { - gf_log (xl->name, GF_LOG_DEBUG, + gf_log ("server", GF_LOG_DEBUG, "failed to get serialized length of reply dict"); op_ret = -1; op_errno = EINVAL; @@ -5670,7 +5670,7 @@ fail: if (dict_len) { ret = dict_serialize (reply, rsp->buf); if (ret < 0) { - gf_log (xl->name, GF_LOG_DEBUG, + gf_log ("server", GF_LOG_DEBUG, "failed to serialize reply dict"); op_ret = -1; op_errno = -ret; @@ -6524,15 +6524,19 @@ int notify (xlator_t *this, int32_t event, void *data, ...) { int ret = 0; - transport_t *trans = data; + transport_t *trans = NULL; peer_info_t *peerinfo = NULL; peer_info_t *myinfo = NULL; - if (trans != NULL) { - peerinfo = &(trans->peerinfo); - myinfo = &(trans->myinfo); + trans = data; + if (!trans) { + gf_log (this->name, GF_LOG_ERROR, "!trans"); + goto out; } + peerinfo = &(trans->peerinfo); + myinfo = &(trans->myinfo); + switch (event) { case GF_EVENT_POLLIN: ret = protocol_server_pollin (this, trans); @@ -6576,7 +6580,7 @@ notify (xlator_t *this, int32_t event, void *data, ...) default_notify (this, event, data); break; } - +out: return ret; } |