colin/iio-sensor-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: Fix channel info leak in build_channel_array()

Browse Source 
On error, the channel info would just be left unfreed.

From Coverity:
iio-sensor-proxy-3.3/src/iio-buffer-utils.c:330: leaked_storage: Variable "current" going out of scope leaks the storage it points to.
iio-sensor-proxy-3.3/src/iio-buffer-utils.c:312: leaked_storage: Variable "current" going out of scope leaks the storage it points to.
iio-sensor-proxy-3.3/src/iio-buffer-utils.c:304: leaked_storage: Variable "current" going out of scope leaks the storage it points to.
iio-sensor-proxy-3.3/src/iio-buffer-utils.c:302: leaked_storage: Variable "current" going out of scope leaks the storage it points to.
iio-sensor-proxy-3.3/src/iio-buffer-utils.c:293: leaked_storage: Variable "current" going out of scope leaks the storage it points to.
iio-sensor-proxy-3.3/src/iio-buffer-utils.c:289: leaked_storage: Variable "current" going out of scope leaks the storage it points to.
iio-sensor-proxy-3.3/src/iio-buffer-utils.c:350:2: warning[unix.Malloc]: Potential leak of memory pointed to by 'current'
This commit is contained in:
Bastien Nocera
2022-03-25 12:32:38 +01:00
parent 18a043f37f
commit d87732b64c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/iio-buffer-utils.c
View File

@@ -213,6 +213,8 @@ compare_channel_index (gconstpointer a, gconstpointer b)
return (int) (info_1->index - info_2->index); return (int) (info_1->index - info_2->index);
} }
G_DEFINE_AUTOPTR_CLEANUP_FUNC(iio_channel_info, channel_info_free)
/* build_channel_array() - function to figure out what channels are present */ /* build_channel_array() - function to figure out what channels are present */
static iio_channel_info ** static iio_channel_info **
build_channel_array (const char *device_dir, build_channel_array (const char *device_dir,
@@ -243,7 +245,7 @@ build_channel_array (const char *device_dir,
if (g_str_has_suffix (name, "_en")) { if (g_str_has_suffix (name, "_en")) {
g_autoptr(FILE) sysfsfp = NULL; g_autoptr(FILE) sysfsfp = NULL;
char *filename, *index_name; char *filename, *index_name;
iio_channel_info *current; g_autoptr(iio_channel_info) current = NULL;
filename = g_build_filename (scan_el_dir, name, NULL); filename = g_build_filename (scan_el_dir, name, NULL);
sysfsfp = fopen (filename, "r"); sysfsfp = fopen (filename, "r");
@@ -315,7 +317,7 @@ build_channel_array (const char *device_dir,
g_warning ("Could not parse name %s, generic name %s", g_warning ("Could not parse name %s, generic name %s",
current->name, current->generic_name); current->name, current->generic_name);
} else { } else {
g_ptr_array_add (array, current); g_ptr_array_add (array, g_steal_pointer (&current));
} }
} }
} }