From: poljar (Damir Jelić) <redacted>
Date: Thu, 14 Nov 2013 19:01:18 +0000 (+0100)
Subject: sigrok-cli: Fix two memory leaks in parse_probestring().
X-Git-Tag: sigrok-cli-0.5.0~69
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=8ec203864b3a33b731c591034d06d55998210a79;ds=inline

sigrok-cli: Fix two memory leaks in parse_probestring().

This patch fixes two memory leaks if multiple probe names or probe ranges are
specified.
---

diff --git a/parsers.c b/parsers.c
index 206e1d6..e940417 100644
--- a/parsers.c
+++ b/parsers.c
@@ -73,25 +73,25 @@ GSList *parse_probestring(struct sr_dev_inst *sdi, const char *probestring)
 				/* Need exactly two arguments. */
 				g_critical("Invalid probe syntax '%s'.", tokens[i]);
 				ret = SR_ERR;
-				break;
+				goto range_fail;
 			}
 
 			b = strtol(range[0], &eptr, 10);
 			if (eptr == range[0] || *eptr != '\0') {
 				g_critical("Invalid probe '%s'.", range[0]);
 				ret = SR_ERR;
-				break;
+				goto range_fail;
 			}
 			e = strtol(range[1], NULL, 10);
 			if (eptr == range[1] || *eptr != '\0') {
 				g_critical("Invalid probe '%s'.", range[1]);
 				ret = SR_ERR;
-				break;
+				goto range_fail;
 			}
 			if (b < 0 || b >= e) {
 				g_critical("Invalid probe range '%s'.", tokens[i]);
 				ret = SR_ERR;
-				break;
+				goto range_fail;
 			}
 
 			while (b <= e) {
@@ -110,6 +110,10 @@ GSList *parse_probestring(struct sr_dev_inst *sdi, const char *probestring)
 				probelist = g_slist_append(probelist, probe);
 				b++;
 			}
+range_fail:
+			if (range)
+				g_strfreev(range);
+
 			if (ret != SR_OK)
 				break;
 		} else {
@@ -133,13 +137,11 @@ GSList *parse_probestring(struct sr_dev_inst *sdi, const char *probestring)
 				probe->name = g_strdup(names[1]);
 			}
 			probelist = g_slist_append(probelist, probe);
+
+			if (names)
+				g_strfreev(names);
 		}
 	}
-	if (range)
-		g_strfreev(range);
-
-	if (names)
-		g_strfreev(names);
 
 	if (ret != SR_OK) {
 		g_slist_free(probelist);