summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src
diff options
context:
space:
mode:
authorDanny Couture <couture.danny@gmail.com>2017-07-05 09:55:17 -0400
committerShyamsundar Ranganathan <srangana@redhat.com>2017-07-19 11:25:02 +0000
commit590a7718c948d02ad93ce4f68c9c75ec0674a3cd (patch)
treeda12f74c12611f5d7f25ff7ac6df8bb8f0e52e04 /libglusterfs/src
parent796bed797858d3e9699f0f311e00e2fb34c25be2 (diff)
fuse: memory leak fixes
Fix fuse ctx memory leak in case an error occurs and the cleanup path is different than usual. Also fix a memory leak in logging if eh_save_history() fails. Cherry picked from commit 5ee383fed9f6408d303aa539dda071275021f8e4: > Change-Id: I7ec967c807b0ed91184e5b958be70702215c46c9 > BUG: 1470220 > Signed-off-by: Danny Couture <couture.danny@gmail.com> > Reviewed-on: https://review.gluster.org/17759 > Reviewed-by: Niels de Vos <ndevos@redhat.com> > Smoke: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: N Balachandran <nbalacha@redhat.com> > Reviewed-by: Prashanth Pai <ppai@redhat.com> > Reviewed-by: Amar Tumballi <amarts@redhat.com> > Tested-by: Amar Tumballi <amarts@redhat.com> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Change-Id: I7ec967c807b0ed91184e5b958be70702215c46c9 BUG: 1471025 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: https://review.gluster.org/17775 Smoke: Gluster Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'libglusterfs/src')
-rw-r--r--libglusterfs/src/logging.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libglusterfs/src/logging.c b/libglusterfs/src/logging.c
index a8e7b96a24c..3436b9f4989 100644
--- a/libglusterfs/src/logging.c
+++ b/libglusterfs/src/logging.c
@@ -2302,6 +2302,8 @@ _gf_log_eh (const char *function, const char *fmt, ...)
strcat (msg, str2);
ret = eh_save_history (this->history, msg);
+ if (ret < 0)
+ GF_FREE (msg);
out:
GF_FREE (str1);