colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: fix memleak in nm_utils_get_start_time_for_pid() and parsing start-time

Browse Source 
It was leaking @tokens in case of error. Also the error checking of
start-time with strtoull() was erroneous.
This commit is contained in:
Thomas Haller
2015-06-30 14:05:44 +02:00
parent 4fbd42a035
commit 67057079a4
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/NetworkManagerUtils.c
View File

@@ -371,10 +371,10 @@ guint64
nm_utils_get_start_time_for_pid (pid_t pid, char *out_state)
{
guint64 start_time;
gchar *filename;
gchar *contents;
gs_free gchar *filename = NULL;
gs_free gchar *contents = NULL;
size_t length;
gchar **tokens;
gs_strfreev gchar **tokens = NULL;
guint num_tokens;
gchar *p;
gchar *endp;
@@ -410,19 +410,15 @@ nm_utils_get_start_time_for_pid (pid_t pid, char *out_state)
if (num_tokens < 20)
goto out;
errno = 0;
start_time = strtoull (tokens[19], &endp, 10);
if (endp == tokens[19])
goto out;
g_strfreev (tokens);
if (*endp != '\0' || errno != 0)
start_time = 0;
out:
if (out_state)
*out_state = state;
g_free (filename);
g_free (contents);
return start_time;
}