Narcissus/nwipe
2
0
Fork 0
mirror of https://github.com/martijnvanbrummelen/nwipe.git synced 2026-02-20 13:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check autonuke and nogui for valid values

Browse Source 
Because autonuke can do a lot of damage we
need to be sure it's value is 1 before letting
it auto wipe. The previous code was assuming
any non zero value was TRUE. In the case of a bug
or memory corruption this could cause an
unintended auto wipe of all discs.
This commit is contained in:
PartialVolume
2025-12-29 23:21:33 +00:00
parent f8f64ba7e7
commit 9c91d19d14
2 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/nwipe.c
View File

@@ -524,7 +524,7 @@ int main( int argc, char** argv )
for( i = 0; i < nwipe_enumerated; i++ )
{
if( nwipe_options.autonuke )
if( nwipe_options.autonuke == 1 )
{
/* When the autonuke option is set, select all disks. */
// TODO - partitions
@@ -572,33 +572,54 @@ int main( int argc, char** argv )
&nwipe_temperature_thread, NULL, nwipe_update_temperature_thread, &nwipe_temperature_thread_data );
/* Start the ncurses interface. */
if( !nwipe_options.nogui )
nwipe_gui_init();
if( nwipe_options.autonuke == 1 )
switch( nwipe_options.nogui )
{
/* Print the options window. */
if( !nwipe_options.nogui )
nwipe_gui_options();
case 0:
nwipe_gui_init();
break;
case 1:
break;
default:
printf( "system error: nwipe_options.nogui (should be 0 or 1) is invalid, nwipe_options.nogui=%i !? \n",
nwipe_options.nogui );
}
else
{
/* Get device selections from the user. */
if( nwipe_options.nogui )
{
printf( "--nogui option must be used with autonuke option\n" );
cleanup();
exit( 1 );
}
else
{
if( nwipe_options.PDF_preview_details == 1 )
{
nwipe_gui_preview_org_customer( SHOWING_PRIOR_TO_DRIVE_SELECTION );
}
nwipe_gui_select( nwipe_enumerated, c1 );
}
switch( nwipe_options.autonuke )
{
case 0:
/* The user can't specify the nogui option without also using the autonuke option */
if( nwipe_options.nogui == 1 )
{
printf( "--nogui option must be used with autonuke option\n" );
cleanup();
exit( 1 );
}
else
{
/* If selected show customer and organisation details BEFORE drive selection screen */
if( nwipe_options.PDF_preview_details == 1 )
{
nwipe_gui_preview_org_customer( SHOWING_PRIOR_TO_DRIVE_SELECTION );
}
/* Get device selections from the user. */
nwipe_gui_select( nwipe_enumerated, c1 );
}
break;
case 1:
/* Print the options window. */
if( !nwipe_options.nogui )
nwipe_gui_options();
break;
default:
printf(
"system error: nwipe_options.autonuke (should be 0 or 1) is invalid, nwipe_options.autonuke=%i !? \n",
nwipe_options.autonuke );
}
/* Initialise some of the variables in the drive contexts

2
src/options.c
View File

@@ -698,7 +698,7 @@ void nwipe_options_log( void )
nwipe_log( NWIPE_LOG_NOTICE, "Program options are set as follows..." );
if( nwipe_options.autonuke )
if( nwipe_options.autonuke == 1 )
{
nwipe_log( NWIPE_LOG_NOTICE, " autonuke = %i (on)", nwipe_options.autonuke );
}