Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 08:09:32 +02:00
Code Issues Releases Wiki Activity

Apply Debian patch fixing a Portmixer-related crash (bug 174)

Browse Source
This commit is contained in:
BusinessmanProgrammerSteve 2010-07-02 06:27:45 +00:00
parent df4e7d2bf5
commit fc0dadf93c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib-src/portmixer/src/px_linux_alsa.c
View File

@ -136,7 +136,10 @@ static int open_mixer(PxDev *dev, int card, int playback)
dev->numselems++; dev->numselems++;
} }
else if (snd_mixer_selem_is_enum_capture(elem)) { else if (snd_mixer_selem_is_enum_capture(elem)) {
dev->numselems += snd_mixer_selem_get_enum_items(elem); int retval = snd_mixer_selem_get_enum_items(elem);
if (retval > 0)
dev->numselems += retval;
} }
} }
} }
@ -196,12 +199,15 @@ static int open_mixer(PxDev *dev, int card, int playback)
i++; i++;
} }
else if (snd_mixer_selem_is_enum_capture(elem)) { else if (snd_mixer_selem_is_enum_capture(elem)) {
unsigned int cnt = snd_mixer_selem_get_enum_items(elem); int j;
unsigned int j; int cnt = snd_mixer_selem_get_enum_items(elem);
if (cnt < 0)
continue;
for (j = 0; j < cnt; j++) { for (j = 0; j < cnt; j++) {
char iname[256]; char iname[256];
snd_mixer_selem_get_enum_item_name(elem, j, sizeof(iname), iname); snd_mixer_selem_get_enum_item_name(elem, (unsigned int) j, sizeof(iname), iname);
snprintf(name, snprintf(name,
sizeof(name), sizeof(name),
"%s:%d", "%s:%d",