diff options
| author | Michael Biebl <biebl@debian.org> | 2012-10-26 21:33:05 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-10-26 21:33:05 +0200 |
| commit | 3e08ba570f7e146b67c0f9dfd17dc04987ebac18 (patch) | |
| tree | ec993cb408a2edb4bb48ce86db4eaca09def6260 /src/settings/plugins/keyfile/reader.c | |
| parent | 74d97e718091bb137b480fb31d740fe20677812b (diff) | |
| parent | 36cb2f364a821e1be50b23e03a18891ec55adb06 (diff) | |
Merge tag 'upstream/0.9.6.4' into experimental
Upstream version 0.9.6.4
Diffstat (limited to 'src/settings/plugins/keyfile/reader.c')
| -rw-r--r-- | src/settings/plugins/keyfile/reader.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c index 47392978..7f0ab4af 100644 --- a/src/settings/plugins/keyfile/reader.c +++ b/src/settings/plugins/keyfile/reader.c @@ -113,10 +113,11 @@ read_ip4_addresses (GKeyFile *file, key_name = g_strdup_printf ("%s%d", key, i); tmp = g_key_file_get_string_list (file, setting_name, key_name, &length, NULL); - g_free (key_name); - if (!tmp || !length) + if (!tmp || !length) { + g_free (key_name); break; /* all done */ + } if ((length < 2) || (length > 3)) { g_warning ("%s: ignoring invalid IPv4 address item '%s'", __func__, key_name); @@ -157,6 +158,7 @@ read_ip4_addresses (GKeyFile *file, g_ptr_array_add (addresses, address); next: + g_free (key_name); g_strfreev (tmp); } |