summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-volgen.c
diff options
context:
space:
mode:
authorShwetha Acharya <sacharya@redhat.com>2018-10-01 12:39:48 +0530
committerAtin Mukherjee <amukherj@redhat.com>2018-10-12 03:14:17 +0000
commit522dcab94ae9938c072cf50062b507cedafdc011 (patch)
tree8165ec73784ed002348a09f87e79fa8d331abfb6 /xlators/mgmt/glusterd/src/glusterd-volgen.c
parent62faf7d37bd8b6be6657b1e3b61f92eac5b84653 (diff)
mgmt/glusterd: NULL pointer dereferencing clang fix
Problem: dereferencing of this->name; volinfo and xl can be null. Solution: Replaced this->name with apropriate names in few places, added a null check to avoid dereferencing of volinfo, and introduced a goto out statement, such that null pointer value is not passed to the function volgen_xlator_link when xl becomes NULL. Updates: bz#1622665 Change-Id: I77616bd23f58328cb6dbe681914a028991d49abb Signed-off-by: Shwetha Acharya <sacharya@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 3e291e0..13b289f 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -3383,12 +3383,12 @@ volgen_link_bricks(volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
if ((i % sub_count) == 0) {
xl = volgen_graph_add_nolink(graph, xl_type, xl_namefmt, volname,
j);
- if (!xl) {
- ret = -1;
- goto out;
- }
j++;
}
+ if (!xl) {
+ ret = -1;
+ goto out;
+ }
ret = volgen_xlator_link(xl, trav);
if (ret)