Closed file pointer leak in case of error with audio source. Coverity CID 21816.

1.4.2
Thomas Schmitt 7 years ago
parent 0f5b28ee64
commit 20d01446d1
  1. 7
      cdrskin/cdrskin.c
  2. 2
      cdrskin/cdrskin_timestamp.h

@ -1402,8 +1402,11 @@ int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
}
if(track->use_data_image_size==1 && xtr_size<=0) {
ret= Cdrtrack_seek_isosize(track,*fd,0);
if(ret==-1)
if(ret == -1) {
close(*fd);
*fd= -1;
return(-1);
}
} else if(track->fixed_size<=0) {
/* >>> ??? is it intentional that tsize overrides .wav header ? */
@ -1424,6 +1427,7 @@ int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
}
}
track->source_fd= *fd;
if(track->fixed_size < Cdrtrack_minimum_sizE * track->sector_size
&& (track->fixed_size>0 || size_from_file) && !(flag&2)) {
if(track->track_type == BURN_AUDIO) {
@ -1441,7 +1445,6 @@ int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
track->fixed_size= Cdrtrack_minimum_sizE*track->sector_size;
}
}
track->source_fd= *fd;
return(*fd>=0);
}

@ -1 +1 @@
#define Cdrskin_timestamP "2015.10.24.080544"
#define Cdrskin_timestamP "2015.10.26.092929"

Loading…
Cancel
Save