libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Schmitt 2015-10-26 09:27:34 +00:00
parent 0f5b28ee64
commit 20d01446d1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cdrskin/cdrskin.c
View File

@ -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) { if(track->use_data_image_size==1 && xtr_size<=0) {
ret= Cdrtrack_seek_isosize(track,*fd,0); ret= Cdrtrack_seek_isosize(track,*fd,0);
if(ret==-1) if(ret == -1) {
close(*fd);
*fd= -1;
return(-1); return(-1);
}
} else if(track->fixed_size<=0) { } else if(track->fixed_size<=0) {
/* >>> ??? is it intentional that tsize overrides .wav header ? */ /* >>> ??? 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 if(track->fixed_size < Cdrtrack_minimum_sizE * track->sector_size
&& (track->fixed_size>0 || size_from_file) && !(flag&2)) { && (track->fixed_size>0 || size_from_file) && !(flag&2)) {
if(track->track_type == BURN_AUDIO) { 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->fixed_size= Cdrtrack_minimum_sizE*track->sector_size;
} }
} }
track->source_fd= *fd;
return(*fd>=0); return(*fd>=0);
} }

2
cdrskin/cdrskin_timestamp.h
View File

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