diff options
Diffstat (limited to 'xlators/protocol/server/src')
| -rw-r--r-- | xlators/protocol/server/src/server-handshake.c | 3 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-helpers.c | 3 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-resolve.c | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c index d386e9ce55b..f9a4bca364c 100644 --- a/xlators/protocol/server/src/server-handshake.c +++ b/xlators/protocol/server/src/server-handshake.c @@ -91,7 +91,8 @@ _volfile_update_checksum (xlator_t *this, char *key, uint32_t checksum) if (!temp_volfile) { temp_volfile = GF_CALLOC (1, sizeof (struct _volfile_ctx), gf_server_mt_volfile_ctx_t); - + if (!temp_volfile) + goto out; temp_volfile->next = conf->volfile; temp_volfile->key = (key)? gf_strdup (key): NULL; temp_volfile->checksum = checksum; diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index 37418ac1de4..84c66d1141d 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -684,6 +684,8 @@ server_connection_get (xlator_t *this, const char *id) if (!conn) { conn = (void *) GF_CALLOC (1, sizeof (*conn), gf_server_mt_conn_t); + if (!conn) + goto unlock; conn->id = gf_strdup (id); conn->fdtable = gf_fd_fdtable_alloc (); @@ -697,6 +699,7 @@ server_connection_get (xlator_t *this, const char *id) conn->ref++; conn->active_transports++; } +unlock: pthread_mutex_unlock (&conf->mutex); return conn; diff --git a/xlators/protocol/server/src/server-resolve.c b/xlators/protocol/server/src/server-resolve.c index 77336216f19..91cf0d96f30 100644 --- a/xlators/protocol/server/src/server-resolve.c +++ b/xlators/protocol/server/src/server-resolve.c @@ -75,6 +75,8 @@ prepare_components (call_frame_t *frame) count = component_count (resolve->path); components = GF_CALLOC (sizeof (*components), count, gf_server_mt_resolv_comp_t); + if (!components) + goto out; resolve->components = components; components[0].basename = ""; @@ -90,7 +92,7 @@ prepare_components (call_frame_t *frame) i++; } } - +out: return 0; } |