libburnia/libisofs-legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Installed protection against resource leak in Cdrskin_grab_drive()

Browse Source
This commit is contained in:
Thomas Schmitt 2006-08-25 13:03:22 +00:00
parent 525322ddf1
commit 20a0c61fd6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cdrskin/cdrskin.c
View File

@ -2016,10 +2016,14 @@ int Cdrskin_grab_drive(struct CdrskiN *skin, int flag)
int restore_handler= 0,ret; int restore_handler= 0,ret;
struct burn_drive *drive; struct burn_drive *drive;
if(skin->drive_is_grabbed)
Cdrskin_release_drive(skin,0);
drive= skin->drives[skin->driveno].drive; drive= skin->drives[skin->driveno].drive;
skin->grabbed_drive= drive; skin->grabbed_drive= drive;
#ifdef Cdrskin_grab_abort_brokeN #ifdef Cdrskin_grab_abort_brokeN
/* There seems to be no way to get a drive out of status BURN_DRIVE_GRABBING /* There seems to be no way to get a drive out of status BURN_DRIVE_GRABBING
So try to block out signals if there is a signal handler installed */ So try to block out signals if there is a signal handler installed */
if(skin->preskin->abort_handler==1 || if(skin->preskin->abort_handler==1 ||
@ -2028,11 +2032,12 @@ int Cdrskin_grab_drive(struct CdrskiN *skin, int flag)
Cleanup_set_handlers(NULL,NULL,2); Cleanup_set_handlers(NULL,NULL,2);
restore_handler= 1; restore_handler= 1;
} }
#endif /* Cdrskin_grab_abort_brokeN */ #endif /* Cdrskin_grab_abort_brokeN */
#ifdef Cdrskin_new_api_tesT #ifdef Cdrskin_new_api_tesT
if(flag&1) {
if(flag&1) {
fprintf(stderr, fprintf(stderr,
"cdrskin: experimental: Cdrskin_grab_drive() on Cdrskin_new_api_tesT\n"); "cdrskin: experimental: Cdrskin_grab_drive() on Cdrskin_new_api_tesT\n");
@ -2041,8 +2046,11 @@ int Cdrskin_grab_drive(struct CdrskiN *skin, int flag)
goto unable; goto unable;
skin->driveno= 0; skin->driveno= 0;
} else { } else {
#else #else
{ {
#endif /* ! Cdrskin_new_api_tesT */ #endif /* ! Cdrskin_new_api_tesT */
/* RIP-14.5 + LITE-ON 48125S produce a false status if tray was unloaded */ /* RIP-14.5 + LITE-ON 48125S produce a false status if tray was unloaded */