A couple more memory leaks from cppcheck

This commit is contained in:
R. Bernstein
2009-10-27 21:14:37 -04:00
parent 273ba31e3a
commit b43dc9cd98
2 changed files with 20 additions and 17 deletions

View File

@@ -1374,7 +1374,6 @@ verify_read_command(cdrom_drive_t *d)
static void static void
check_fua_bit(cdrom_drive_t *d){ check_fua_bit(cdrom_drive_t *d){
int16_t *buff=malloc(CDIO_CD_FRAMESIZE_RAW);
long i; long i;
if(d->read_audio==scsi_read_mmc)return; if(d->read_audio==scsi_read_mmc)return;
@@ -1386,26 +1385,29 @@ check_fua_bit(cdrom_drive_t *d){
d->enable_cdda(d,1); d->enable_cdda(d,1);
d->fua=1; d->fua=1;
for(i=1;i<=d->tracks;i++){ {
if(cdda_track_audiop(d,i)==1){ int16_t *buff=malloc(CDIO_CD_FRAMESIZE_RAW);
long firstsector=cdda_track_firstsector(d,i); for(i=1;i<=d->tracks;i++){
long lastsector=cdda_track_lastsector(d,i); if(cdda_track_audiop(d,i)==1){
long sector=(firstsector+lastsector)>>1; long firstsector=cdda_track_firstsector(d,i);
long lastsector=cdda_track_lastsector(d,i);
long sector=(firstsector+lastsector)>>1;
if(d->read_audio(d,buff,sector,1)>0){ if(d->read_audio(d,buff,sector,1)>0){
cdmessage(d,"\tDrive accepted FUA bit.\n"); cdmessage(d,"\tDrive accepted FUA bit.\n");
d->enable_cdda(d,0); d->enable_cdda(d,0);
free(buff); free(buff);
return; return;
}
} }
} }
}
d->fua=0; d->fua=0;
cdmessage(d,"\tDrive rejected FUA bit.\n"); cdmessage(d,"\tDrive rejected FUA bit.\n");
free(buff); free(buff);
return; return;
}
} }
static int static int

View File

@@ -429,6 +429,7 @@ cdio_close_tray (const char *psz_orig_drive, /*in/out*/ driver_id_t
return drc; return drc;
} }
} }
free(psz_drive);
return DRIVER_OP_UNSUPPORTED; return DRIVER_OP_UNSUPPORTED;
} }