From 590a7718c948d02ad93ce4f68c9c75ec0674a3cd Mon Sep 17 00:00:00 2001
From: Danny Couture <couture.danny@gmail.com>
Date: Wed, 5 Jul 2017 09:55:17 -0400
Subject: 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>
---
 libglusterfs/src/logging.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libglusterfs/src')

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);
-- 
cgit