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

Distinguishing between self-opened and inherited file descriptors as track input. Coverity CID 21819.

Browse Source
This commit is contained in:
Thomas Schmitt 2015-10-26 14:51:18 +00:00
parent d9206d7fdb
commit 8ba554a60d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cdrskin/cdrskin.c
View File

@ -1322,7 +1322,7 @@ int Cdrtrack_seek_isosize(struct CdrtracK *track, int fd, int flag)
*/ */
int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag) int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
{ {
int is_wav= 0, size_from_file= 0, ret; int is_wav= 0, size_from_file= 0, ret, self_opened= 0;
off_t xtr_size= 0; off_t xtr_size= 0;
struct stat stbuf; struct stat stbuf;
char *device_adr,*raw_adr; char *device_adr,*raw_adr;
@ -1340,6 +1340,7 @@ int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
*fd= atoi(track->source_path+1); *fd= atoi(track->source_path+1);
else { else {
*fd= -1; *fd= -1;
self_opened= 1;
ret= Cdrskin_get_device_adr(track->boss,&device_adr,&raw_adr, ret= Cdrskin_get_device_adr(track->boss,&device_adr,&raw_adr,
&no_convert_fs_adr,0); &no_convert_fs_adr,0);
@ -1445,7 +1446,7 @@ 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;
} }
} }
return(*fd>=0); return((*fd >= 0) * (2 * self_opened));
} }
@ -6958,6 +6959,7 @@ int Cdrskin_direct_write(struct CdrskiN *skin, int flag)
{ {
off_t byte_address, data_count, chunksize, i, alignment, fill; off_t byte_address, data_count, chunksize, i, alignment, fill;
int ret, max_chunksize= 64*1024, source_fd= -1, is_from_stdin, eof_sensed= 0; int ret, max_chunksize= 64*1024, source_fd= -1, is_from_stdin, eof_sensed= 0;
int self_opened= 0;
char *buf= NULL, *source_path, amount_text[81]; char *buf= NULL, *source_path, amount_text[81];
struct burn_multi_caps *caps= NULL; struct burn_multi_caps *caps= NULL;
@ -6994,6 +6996,8 @@ int Cdrskin_direct_write(struct CdrskiN *skin, int flag)
(4 * (skin->fifo_size >= 256 * 1024))); (4 * (skin->fifo_size >= 256 * 1024)));
if(ret<=0) if(ret<=0)
goto ex; goto ex;
if(ret == 2)
self_opened= 1;
} }
buf= calloc(1, max_chunksize); buf= calloc(1, max_chunksize);
if(buf==NULL) { if(buf==NULL) {
@ -7067,6 +7071,8 @@ ex:;
burn_disc_free_multi_caps(&caps); burn_disc_free_multi_caps(&caps);
if(buf!=NULL) if(buf!=NULL)
free(buf); free(buf);
if(self_opened && source_fd >= 0)
close(source_fd);
if(ret>0) if(ret>0)
fprintf(stderr,"writing done\n"); fprintf(stderr,"writing done\n");
else else

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2015.10.26.105754" #define Cdrskin_timestamP "2015.10.26.145305"