commit 121b5e505fe86ea52603c946865d658a5fe8130b
author Hartmut Knaack <knaack.h@gmx.de> Sun May 31 14:39:45 2015 +0200
committer Jonathan Cameron <jic23@kernel.org> Sun May 31 17:22:56 2015 +0100
tree ca199605bfc1aa3be8e15dc3e56dd16849312149
parent 63f05c855f3825b89b92cd21df0415e6e32af3dd

tools:iio:iio_utils: fix allocation handling

In build_channel_array(), count needs to be decreased in more places since
current->name and current->generic_name would be freed on the error path,
although they have not been allocated, yet.
This also requires to free current->name, when it is allocated, but
current->generic_name is not yet allocated.

Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

tools/iio/iio_utils.c

diff --git a/tools/iio/iio_utils.c b/tools/iio/iio_utils.c
index 6daf98f..1c0ca2f 100644
--- a/tools/iio/iio_utils.c
+++ b/tools/iio/iio_utils.c
@@ -334,6 +334,7 @@
 			if (sysfsfp == NULL) {
 				free(filename);
 				ret = -errno;
+				count--;
 				goto error_cleanup_array;
 			}
 			fscanf(sysfsfp, "%i", &current_enabled);
@@ -353,6 +354,7 @@
 			if (current->name == NULL) {
 				free(filename);
 				ret = -ENOMEM;
+				count--;
 				goto error_cleanup_array;
 			}
 			/* Get the generic and specific name elements */
@@ -360,6 +362,8 @@
 						     &current->generic_name);
 			if (ret) {
 				free(filename);
+				free(current->name);
+				count--;
 				goto error_cleanup_array;
 			}
 			ret = asprintf(&filename,