diff options
| author | Poornima G <pgurusid@redhat.com> | 2015-03-16 15:47:30 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-03-17 22:42:12 -0700 |
| commit | c99c72b35fac16e08c4d170b6a46a786caaeef58 (patch) | |
| tree | 1644650ecac2e828a5201c7b2ec2e0bcef5f2ed4 /api/src | |
| parent | 33944a3eb3b589b1d309826b5f431497924ac3ae (diff) | |
libgfapi, timer: Fix a crash seen in timer when glfs_fini was invoked.
The crash is seen when, glfs_init failed for some reason
and glfs_fini was called for cleaning up the partial initialization.
The fix is in two folds:
1. In timer store and restore the THIS, previously
it was being overwritten.
2. In glfs_free_from_ctx() and glfs_fini() check for
NULL before destroying.
Change-Id: If40bf69936b873a1da8e348c9d92c66f2f07994b
BUG: 1202290
Signed-off-by: Poornima G <pgurusid@redhat.com>
Reviewed-on: http://review.gluster.org/9895
Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'api/src')
| -rw-r--r-- | api/src/glfs.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/api/src/glfs.c b/api/src/glfs.c index 02a8984f450..8bd410c716d 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -664,7 +664,9 @@ priv_glfs_free_from_ctx (struct glfs *fs) (void) pthread_mutex_destroy (&fs->mutex); - FREE (fs->volname); + if (fs->volname) + FREE (fs->volname); + FREE (fs); } @@ -934,13 +936,17 @@ pub_glfs_fini (struct glfs *fs) } ctx = fs->ctx; + if (!ctx) { + goto free_fs; + } + + __glfs_entry_fs (fs); + if (ctx->mgmt) { rpc_clnt_disable (ctx->mgmt); ctx->mgmt = NULL; } - __glfs_entry_fs (fs); - call_pool = fs->ctx->pool; while (countdown--) { @@ -1069,6 +1075,7 @@ pub_glfs_fini (struct glfs *fs) if (glusterfs_ctx_destroy (ctx) != 0) ret = -1; +free_fs: glfs_free_from_ctx (fs); fail: |