coverity: multiple fixes

CID: 1390477, 1124827

updates: bz#789278
Change-Id: I41060d131aec6e58e7267ac8531b29a70f8c4359
Signed-off-by: Amar Tumballi <amarts@redhat.com>
This commit is contained in:
Amar Tumballi 2018-08-27 18:19:58 +05:30
parent 33f53e88c3
commit 6a2f83caad
2 changed files with 10 additions and 4 deletions

View File

@ -1642,6 +1642,9 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
struct rlimit lim = {0, };
int ret = -1;
if (!ctx)
return ret;
ret = xlator_mem_acct_init (THIS, gfd_mt_end);
if (ret != 0) {
gf_msg(THIS->name, GF_LOG_CRITICAL, 0, glusterfsd_msg_34,
@ -1774,7 +1777,7 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
ret = 0;
out:
if (ret && ctx) {
if (ret) {
if (ctx->pool) {
mem_pool_destroy (ctx->pool->frame_mem_pool);
mem_pool_destroy (ctx->pool->stack_mem_pool);

View File

@ -970,7 +970,6 @@ server_init (xlator_t *this)
{
int32_t ret = -1;
server_conf_t *conf = NULL;
rpcsvc_listener_t *listener = NULL;
char *transport_type = NULL;
char *statedump_path = NULL;
int total_transport = 0;
@ -1229,8 +1228,12 @@ out:
this->fini (this);
}
if (listener != NULL) {
rpcsvc_listener_destroy (listener);
if (conf && conf->rpc) {
rpcsvc_listener_t *listener, *next;
list_for_each_entry_safe (listener, next,
&conf->rpc->listeners, list) {
rpcsvc_listener_destroy (listener);
}
}
}