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

Fix obscure incorrect percentage on completion.

Browse Source 
This bug only applies to ones wipe and one or zero's
verification.

A very rare occurrence of a incorrect percentage on
completion. The actual wipe was completed correctly it
was just that the percentage calculation was wrong.

This was due to a variable that was initialised for
all methods except ones, & ones & zeros verification.

For those three method's the uninitialised variable
would have had to have the value 1 or 6 for the
incorrect percentage to be calculated, this is why
it was so rare.

Corrected by initialising the variable with a -1 so
that if no method was found in the array then no
extra calculations as regards the percentage are
performed.
This commit is contained in:
PartialVolume
2023-03-20 19:39:16 +00:00
parent 4f5c15ffad
commit bbfaa0e9f7
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/method.c
View File

@@ -1215,7 +1215,11 @@ void calculate_round_size( nwipe_context_t* c )
* all methods and processed first then created a switch statement that contains method specific changes if any
*/
/* Don't change the order of these values as the case statements use their index in the array */
/* Don't change the order of these values as the case statements use their index in the array, New methods
* don't need to be added to this array unless they have complicated calculations like Ops2 and IS5. If you do
* add a method, just add it to the bottom of the array_methods array and also to the bottom of the switch
* statement.
*/
void* array_methods[] = { &nwipe_zero,
&nwipe_ops2,
&nwipe_dodshort,
@@ -1226,13 +1230,17 @@ void calculate_round_size( nwipe_context_t* c )
NULL };
int i;
/* This while loop allows us to effectively create a const so we can use a case statement rather than if statements.
* This is probably more readable as more methods may get added in the future. The code could be condensed as some
* methods have identical adjustments, however as there are only a few methods I felt it was easier to understand as
* it is, however this could be changed if necessary.
/* This while loop allows us to effectively create a const that represents a method so we can use a case statement
* rather than if statements.
*
* Using a switch statement looks better than if statments as more methods may get added in the future expanding the
* list. The code could be condensed as some methods have identical adjustments, however as there are only a few
* methods I felt it was easier to understand as it is, however this could be changed if necessary.
*/
int selected_method;
/* Initialise, -1 = no additional calculation required */
int selected_method = -1;
i = 0;
while( array_methods[i] != NULL )
{
@@ -1243,6 +1251,10 @@ void calculate_round_size( nwipe_context_t* c )
i++;
}
/* On exit from the while loop the selected method either equals an index to a method
* or it equals -1 which means no extra calculations are required that are method specific
*/
if( nwipe_options.verify == NWIPE_VERIFY_ALL )
{
/* We must read back all passes, so double the byte count. */
@@ -1369,6 +1381,11 @@ void calculate_round_size( nwipe_context_t* c )
}
break;
case -1:
/* Method not listed so don't do any extra calculations
* ---------------------------------------------------- */
break;
}
}