claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

More memory leaks found by valgrind.

Browse Source
This commit is contained in:
rocky
2004-02-21 17:18:04 +00:00
parent 36e7520b68
commit ad2f334b7b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_linux.c,v 1.28 2004/02/07 02:40:20 rocky Exp $ $Id: _cdio_linux.c,v 1.29 2004/02/21 17:18:04 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.28 2004/02/07 02:40:20 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.29 2004/02/21 17:18:04 rocky Exp $";
#include <string.h> #include <string.h>
@@ -177,10 +177,9 @@ cdio_check_mounts(const char *mtab)
} }
if ( strcmp(mnt_type, "iso9660") == 0 ) { if ( strcmp(mnt_type, "iso9660") == 0 ) {
if (cdio_is_cdrom(mnt_dev, mnt_type) > 0) { if (cdio_is_cdrom(mnt_dev, mnt_type) > 0) {
free(mnt_dev);
free(mnt_type); free(mnt_type);
endmntent(mntfp); endmntent(mntfp);
return strdup(mnt_dev); return mnt_dev;
} }
} }
free(mnt_dev); free(mnt_dev);
@@ -867,12 +866,14 @@ cdio_get_devices_linux (void)
/* Now check the currently mounted CD drives */ /* Now check the currently mounted CD drives */
if (NULL != (ret_drive = cdio_check_mounts("/etc/mtab"))) { if (NULL != (ret_drive = cdio_check_mounts("/etc/mtab"))) {
cdio_add_device_list(&drives, drive, &num_drives); cdio_add_device_list(&drives, ret_drive, &num_drives);
free(ret_drive);
} }
/* Finally check possible mountable drives in /etc/fstab */ /* Finally check possible mountable drives in /etc/fstab */
if (NULL != (ret_drive = cdio_check_mounts("/etc/fstab"))) { if (NULL != (ret_drive = cdio_check_mounts("/etc/fstab"))) {
cdio_add_device_list(&drives, drive, &num_drives); cdio_add_device_list(&drives, ret_drive, &num_drives);
free(ret_drive);
} }
/* Scan the system for CD-ROM drives. /* Scan the system for CD-ROM drives.