An invalid known_network.freq file containing several UUID groups which have the same 'name' key results in memory leaks in IWD. This is because the file is loaded and the group's are iterated without detecting duplicates. This leads to the same network_info's known_frequencies being set/overridden multiple times. To fix this we just check if the network_info already has a UUID set. If so remove the stale entry. There may be other old, invalid, or stale entries from previous versions of IWD, or a user misconfiguring the file. These will now also be removed during load. --- src/knownnetworks.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) v3: * Forgot to send 'v2' on last patch * Added removal of ALL invalid entries rather than only network duplicates. diff --git a/src/knownnetworks.c b/src/knownnetworks.c index 53cfc30f..a61d31e7 100644 --- a/src/knownnetworks.c +++ b/src/knownnetworks.c @@ -910,29 +910,36 @@ static int known_network_frequencies_load(void) const char *path = l_settings_get_value(known_freqs, groups[i], "name"); if (!path) - continue; + goto invalid_entry; info = find_network_info_from_path(path); if (!info) - continue; + goto invalid_entry; + + if (info->has_uuid) + goto invalid_entry; freq_list = l_settings_get_string(known_freqs, groups[i], "list"); if (!freq_list) - continue; + goto invalid_entry; known_frequencies = known_frequencies_from_string(freq_list); if (!known_frequencies) - goto next; + goto invalid_entry; if (!l_uuid_from_string(groups[i], uuid)) - goto next; + goto invalid_entry; network_info_set_uuid(info, uuid); info->known_frequencies = known_frequencies; -next: l_free(freq_list); + + continue; + +invalid_entry: + l_settings_remove_group(known_freqs, groups[i]); } l_strv_free(groups); -- 2.26.2