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

Bug fix: cdrskin SIGSEGV if track source was added when no drive was available

This commit is contained in:
Thomas Schmitt 2012-04-04 10:10:55 +00:00
parent 7a7591aec5
commit 564ccc36f5
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cdrskin/cdrskin.c
View File

@ -1341,8 +1341,13 @@ int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
else { else {
*fd= -1; *fd= -1;
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);
if(ret <= 0) {
fprintf(stderr,
"cdrskin: FATAL : No drive found. Cannot prepare track.\n");
return(0);
}
/* /*
fprintf(stderr, fprintf(stderr,
"cdrskin: DEBUG : device_adr='%s' , raw_adr='%s' , ncfs=%d\n", "cdrskin: DEBUG : device_adr='%s' , raw_adr='%s' , ncfs=%d\n",
@ -3706,12 +3711,25 @@ int Cdrskin_destroy(struct CdrskiN **o, int flag)
} }
int Cdrskin_assert_driveno(struct CdrskiN *skin, int flag)
{
if(skin->driveno < 0 || (unsigned int) skin->driveno >= skin->n_drives) {
fprintf(stderr,
"cdrskin: FATAL : No drive found. Cannot perform desired operation.\n");
return(0);
}
return(1);
}
/** Return the addresses of the drive. device_adr is the libburn persistent /** Return the addresses of the drive. device_adr is the libburn persistent
address of the drive, raw_adr is the address as given by the user. address of the drive, raw_adr is the address as given by the user.
*/ */
int Cdrskin_get_device_adr(struct CdrskiN *skin, int Cdrskin_get_device_adr(struct CdrskiN *skin,
char **device_adr, char **raw_adr, int *no_convert_fs_adr, int flag) char **device_adr, char **raw_adr, int *no_convert_fs_adr, int flag)
{ {
if(skin->driveno < 0 || (unsigned int) skin->driveno >= skin->n_drives)
return(0);
burn_drive_get_adr(&skin->drives[skin->driveno],skin->device_adr); burn_drive_get_adr(&skin->drives[skin->driveno],skin->device_adr);
*device_adr= skin->device_adr; *device_adr= skin->device_adr;
*raw_adr= skin->preskin->raw_device_adr; *raw_adr= skin->preskin->raw_device_adr;
@ -3782,6 +3800,10 @@ int Cdrskin_attach_fifo(struct CdrskiN *skin, int flag)
int profile_number; int profile_number;
char profile_name[80]; char profile_name[80];
ret= Cdrskin_assert_driveno(skin, 0);
if(ret <= 0)
return(ret);
/* Refuse here and thus use libburn fifo only with single track, non-CD */ /* Refuse here and thus use libburn fifo only with single track, non-CD */
ret= burn_disc_get_profile(skin->drives[skin->driveno].drive, ret= burn_disc_get_profile(skin->drives[skin->driveno].drive,
&profile_number, profile_name); &profile_number, profile_name);
@ -3960,6 +3982,9 @@ int Cdrskin_grab_drive(struct CdrskiN *skin, int flag)
drive= NULL; drive= NULL;
skin->grabbed_drive= drive; skin->grabbed_drive= drive;
} else { } else {
ret= Cdrskin_assert_driveno(skin, 0);
if(ret <= 0)
return(ret);
drive= skin->drives[skin->driveno].drive; drive= skin->drives[skin->driveno].drive;
skin->grabbed_drive= drive; skin->grabbed_drive= drive;
} }
@ -8720,12 +8745,15 @@ int Cdrskin_create(struct CdrskiN **o, struct CdrpreskiN **preskin,
{*exit_value= 2; goto ex;} {*exit_value= 2; goto ex;}
} }
skin->n_drives= 1; skin->n_drives= 1;
skin->driveno= 0;
burn_drive_release(skin->drives[0].drive, 0); burn_drive_release(skin->drives[0].drive, 0);
} else { } else {
while (!burn_drive_scan(&(skin->drives), &(skin->n_drives))) { while (!burn_drive_scan(&(skin->drives), &(skin->n_drives))) {
usleep(20000); usleep(20000);
/* >>> ??? set a timeout ? */ /* >>> ??? set a timeout ? */
} }
if(skin->n_drives <= 0)
skin->driveno= -1;
} }
burn_msgs_set_severities(skin->preskin->queue_severity, burn_msgs_set_severities(skin->preskin->queue_severity,

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2012.04.02.172347" #define Cdrskin_timestamP "2012.04.04.100754"