arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-23 08:38:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #239 from philsmd/master

Browse Source 
this fixes the beta issue #163 (-d and --opencl-platforms not within valid range)
This commit is contained in:
Jens Steube 2016-02-24 19:53:17 +01:00
commit e688e94384
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/oclHashcat.c
View File

@ -12490,6 +12490,18 @@ int main (int argc, char **argv)
return (-1);
}
if (opencl_platforms_filter != (uint) -1)
{
uint platform_cnt_mask = ~((-1 >> platforms_cnt) << platforms_cnt);
if (opencl_platforms_filter > platform_cnt_mask)
{
log_error ("ERROR: The platform selected by the --opencl-platforms parameter is larger than the number of available platforms (%d)", platforms_cnt);
return (-1);
}
}
}
/**
@ -12945,6 +12957,20 @@ int main (int argc, char **argv)
return (-1);
}
// additional check to see if the user has chosen a device that is not within the range of available devices (i.e. larger than devices_cnt)
if (devices_filter != (uint) -1)
{
uint devices_cnt_mask = ~((-1 >> devices_cnt) << devices_cnt);
if (devices_filter > devices_cnt_mask)
{
log_error ("ERROR: The device specified by the --opencl-devices parameter is larger than the number of available devices (%d)", devices_cnt);
return (-1);
}
}
data.devices_cnt = devices_cnt;
data.devices_active = devices_active;