From: Yair Elharrar <yair@excelero.com>
Date: Mon, 29 Jul 2019 18:47:17 +0000 (+0300)
Subject: fabrics: fix potential memory leaks
X-Git-Tag: v1.11~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=844265a109c813f89155885792c71e0a201789ed;p=users%2Fhch%2Fnvme-cli.git

fabrics: fix potential memory leaks
See issue #505

Signed-off-by: Yair Elharrar <yair@excelero.com>
---

diff --git a/fabrics.c b/fabrics.c
index e2c9bfb..7b2d151 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -1225,7 +1225,7 @@ static int discover_from_conf_file(const char *desc, char *argstr,
 
 		err = argconfig_parse(argc, argv, desc, opts);
 		if (err)
-			continue;
+			goto free_and_continue;
 
 		if (cfg.persistent && !cfg.keep_alive_tmo)
 			cfg.keep_alive_tmo = NVMF_DEF_DISC_TMO;
@@ -1233,15 +1233,14 @@ static int discover_from_conf_file(const char *desc, char *argstr,
 		err = build_options(argstr, BUF_SIZE, true);
 		if (err) {
 			ret = err;
-			continue;
+			goto free_and_continue;
 		}
 
 		err = do_discover(argstr, connect);
-		if (err) {
+		if (err)
 			ret = err;
-			continue;
-		}
 
+free_and_continue:
 		free(args);
 		free(argv);
 	}