Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Re #2987: read_file_system_list() return value memory leak fixed

Browse source
This commit is contained in:
Damjan Adamic 2015-10-24 19:53:41 +02:00
parent d38cf06b07
commit ee4ea18a3e
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
companion/src/mountlist.cpp
View file

@ -922,4 +922,19 @@ read_file_system_list (bool need_fs_type)
} }
} }
void free_file_system_list(struct mount_entry * mount_list)
{
struct mount_entry * me;
while (mount_list)
{
me = mount_list->me_next;
free (mount_list->me_devname);
free (mount_list->me_mountdir);
if (mount_list->me_type_malloced)
free (mount_list->me_type);
free (mount_list);
mount_list = me;
}
}
#endif #endif

2
companion/src/mountlist.h
View file

@ -49,4 +49,6 @@ struct mount_entry
struct mount_entry *read_file_system_list (bool need_fs_type); struct mount_entry *read_file_system_list (bool need_fs_type);
void free_file_system_list(struct mount_entry * mount_list);
#endif #endif

5
companion/src/radiointerface.cpp
View file

@ -411,7 +411,8 @@ QString findMassstoragePath(const QString &filename)
} }
#else #else
struct mount_entry *entry; struct mount_entry *entry;
entry = read_file_system_list(true); struct mount_entry *firstEntry;
firstEntry = entry = read_file_system_list(true);
while (entry != NULL) { while (entry != NULL) {
if (!drives.contains(entry->me_devname)) { if (!drives.contains(entry->me_devname)) {
drives.append(entry->me_devname); drives.append(entry->me_devname);
@ -426,11 +427,13 @@ QString findMassstoragePath(const QString &filename)
#else #else
if (QFile::exists(eepromfile)) { if (QFile::exists(eepromfile)) {
#endif #endif
free_file_system_list(firstEntry);
return eepromfile; return eepromfile;
} }
} }
entry = entry->me_next; entry = entry->me_next;
} }
free_file_system_list(firstEntry);
#endif #endif
return QString(); return QString();