mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Do not abort in snd_xxx_close() functions

Browse source 
Remove several memory leaks by not aborting prematurely from a
snd_xxx_close() function when some operation fails.
This can happen when a USB device was unplugged.
This commit is contained in:
Clemens Ladisch 2006-02-27 09:54:57 +00:00
parent f9c7321670
commit 45850439b3
11 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/rawmidi/rawmidi.c
View file

@ -341,14 +341,13 @@ int snd_rawmidi_close(snd_rawmidi_t *rawmidi)
{
int err;
assert(rawmidi);
if ((err = rawmidi->ops->close(rawmidi)) < 0)
return err;
err = rawmidi->ops->close(rawmidi);
if (rawmidi->name)
free(rawmidi->name);
if (rawmidi->dl_handle)
snd_dlclose(rawmidi->dl_handle);
free(rawmidi);
return 0;
return err;
}
/**

6
src/rawmidi/rawmidi_hw.c
View file

@ -48,15 +48,17 @@ typedef struct {
static int snd_rawmidi_hw_close(snd_rawmidi_t *rmidi)
{
snd_rawmidi_hw_t *hw = rmidi->private_data;
int err = 0;
hw->open--;
if (hw->open)
return 0;
if (close(hw->fd)) {
err = -errno;
SYSERR("close failed\n");
return -errno;
}
free(hw);
return 0;
return err;
}
static int snd_rawmidi_hw_nonblock(snd_rawmidi_t *rmidi, int nonblock)