dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AlsaPCMDeviceFinder: Fix use of deleted memory

Browse Source
This commit is contained in:
Jonas Kvinge
2022-03-29 01:23:00 +02:00
parent c1faa616bc
commit ea86c043a4
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/engine/alsapcmdevicefinder.cpp
View File

@@ -45,14 +45,16 @@ QList<DeviceFinder::Device> AlsaPCMDeviceFinder::ListDevices() {
} }
for (void **n = hints; *n; ++n) { for (void **n = hints; *n; ++n) {
char *io = snd_device_name_get_hint(*n, "IOID"); char *hint_io = snd_device_name_get_hint(*n, "IOID");
char *name = snd_device_name_get_hint(*n, "NAME"); char *hint_name = snd_device_name_get_hint(*n, "NAME");
char *desc = snd_device_name_get_hint(*n, "DESC"); char *hint_desc = snd_device_name_get_hint(*n, "DESC");
if (io && name && desc && strcmp(io, "Output") == 0) { if (hint_io && hint_name && hint_desc && strcmp(hint_io, "Output") == 0) {
char *desc_last = desc; QString name(hint_name);
char *desc_last = hint_desc;
QString description; QString description;
for (char *desc_i = desc; desc_i && *desc_i != '\0'; ++desc_i) { for (char *desc_i = hint_desc; desc_i && *desc_i != '\0'; ++desc_i) {
if (*desc_i == '\n') { if (*desc_i == '\n') {
*desc_i = '\0'; *desc_i = '\0';
if (!description.isEmpty()) description.append(' '); if (!description.isEmpty()) description.append(' ');
@@ -72,9 +74,9 @@ QList<DeviceFinder::Device> AlsaPCMDeviceFinder::ListDevices() {
device.iconname = GuessIconName(device.description); device.iconname = GuessIconName(device.description);
ret << device; // clazy:exclude=reserve-candidates ret << device; // clazy:exclude=reserve-candidates
} }
if (io) free(io); if (hint_io) free(hint_io);
if (name) free(name); if (hint_name) free(hint_name);
if (desc) free(desc); if (hint_desc) free(hint_desc);
} }
snd_device_name_free_hint(hints); snd_device_name_free_hint(hints);