From 0967f3dd0d73263c843d76e1837aa78c3fbf14c1 Mon Sep 17 00:00:00 2001 From: Mohammed Rafi KC Date: Fri, 23 Nov 2018 11:31:38 +0530 Subject: coverity: Fix coverity issues This patch fixes coverity CID : 1356537 https://scan6.coverity.com/reports.htm#v42907/p10714/fileInstanceId=87389108&defectInstanceId=26791927&mergedDefectId=1356537 CID : 1395666 https://scan6.coverity.com/reports.htm#v42907/p10714/fileInstanceId=87389187&defectInstanceId=26791932&mergedDefectId=1395666 CID : 1351707 https://scan6.coverity.com/reports.htm#v42907/p10714/fileInstanceId=87389027&defectInstanceId=26791973&mergedDefectId=1351707 CID : 1396910 https://scan6.coverity.com/reports.htm#v42907/p10714/fileInstanceId=87389027&defectInstanceId=26791973&mergedDefectId=13596910 Change-Id: I8094981a741f4d61b083c05a98df23dcf5b022a2 updates: bz#789278 Signed-off-by: Mohammed Rafi KC --- glusterfsd/src/glusterfsd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'glusterfsd/src') diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index a1626a81e9f..58dc521b565 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -2562,6 +2562,9 @@ glusterfs_process_volfp(glusterfs_ctx_t *ctx, FILE *fp) int ret = -1; xlator_t *trav = NULL; + if (!ctx) + return -1; + graph = glusterfs_graph_construct(fp); if (!graph) { gf_msg("", GF_LOG_ERROR, 0, glusterfsd_msg_26, @@ -2610,7 +2613,7 @@ out: */ if (graph) { xl = graph->first; - if ((ctx && (ctx->active != graph)) && + if ((ctx->active != graph) && (xl && !strcmp(xl->type, "protocol/server"))) { glusterfs_graph_fini(graph); glusterfs_graph_destroy(graph); @@ -2618,7 +2621,7 @@ out: } /* there is some error in setting up the first graph itself */ - if (!ctx || !ctx->active) { + if (!ctx->active) { emancipate(ctx, ret); cleanup_and_exit(ret); } -- cgit