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

Redo in a way simpler way that and in a way that valgrind doesn't

Browse Source 
think there's a memory leak.
This commit is contained in:
rocky
2005-01-15 03:22:48 +00:00
parent a3bafd4ba7
commit 9137470a8e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/cdda_interface/scan_devices.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: scan_devices.c,v 1.10 2005/01/14 03:41:11 rocky Exp $ $Id: scan_devices.c,v 1.11 2005/01/15 03:22:48 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -256,10 +256,15 @@ cdda_identify_cooked(const char *dev, int messagedest, char **messages)
cdio_hwinfo_t hw_info; cdio_hwinfo_t hw_info;
if ( scsi_mmc_get_hwinfo( p_cdio, &hw_info ) ) { if ( scsi_mmc_get_hwinfo( p_cdio, &hw_info ) ) {
d->drive_model=calloc(36,1); unsigned int i_len = strlen(hw_info.psz_vendor)
snprintf(d->drive_model, 36, "%s%s%s ", + strlen(hw_info.psz_model)
hw_info.psz_vendor, hw_info.psz_model, hw_info.psz_revision ); + strlen(hw_info.psz_revision)
catstring(d->drive_model, description); + strlen(description) + 3;
d->drive_model=malloc( i_len );
snprintf( d->drive_model, i_len, "%s%s%s %s",
hw_info.psz_vendor, hw_info.psz_model, hw_info.psz_revision,
description );
idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n", idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",
d->drive_model); d->drive_model);
if (description) free(description); if (description) free(description);