From d73ca4a5bfad1e46dfc4a3a12401d8720b05c298 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 30 Sep 2016 12:55:40 +0200 Subject: [PATCH] tests: gfapi/bug1291259.c should only call glfs_free() on success In case glfs_h_poll_upcall() does not return success, the 'struct glfs_upcall' would not have been allocated. A retry will be done and glfs_free() is called on the unallocated structure. In case the pointer does not point to NULL, glfs_free() will try to free up some random area. Change-Id: I38788d3bf22bbac3924f25edf45cd4a2637fa777 BUG: 1371540 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/15603 NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Smoke: Gluster Build System Reviewed-by: jiffin tony Thottan --- tests/basic/gfapi/bug1291259.c | 6 ++++-- tests/basic/gfapi/bug1291259.t | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/basic/gfapi/bug1291259.c b/tests/basic/gfapi/bug1291259.c index 78b95c6dc..26fc1e014 100644 --- a/tests/basic/gfapi/bug1291259.c +++ b/tests/basic/gfapi/bug1291259.c @@ -161,8 +161,10 @@ retry: if (!upcall_received) sleep (1); /* glfs_h_poll_upcall() does not block */ - glfs_free (cbk); - cbk = NULL; + if (!ret) { + glfs_free (cbk); + cbk = NULL; + } } if (!upcall_received) { diff --git a/tests/basic/gfapi/bug1291259.t b/tests/basic/gfapi/bug1291259.t index 570ac00a3..2247c567f 100755 --- a/tests/basic/gfapi/bug1291259.t +++ b/tests/basic/gfapi/bug1291259.t @@ -28,5 +28,3 @@ TEST $CLI volume stop $V0 TEST $CLI volume delete $V0 cleanup; -#G_TESTDEF_TEST_STATUS_NETBSD7=BAD_TEST,BUG=1371540 -#G_TESTDEF_TEST_STATUS_CENTOS6=BAD_TEST,BUG=1371540