1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-24 15:38:11 +00:00

Merge pull request #1111 from hashcat/revert-1108-master

Revert "tainted string: test number 2, try to limit the length of the compute variable"
This commit is contained in:
Jens Steube 2017-02-15 14:18:19 +01:00 committed by GitHub
commit 5d14e04f9c

View File

@ -258,18 +258,18 @@ void setup_environment_variables ()
{
static char display[100];
u32 compute_len_max = sizeof (display);
snprintf (display, sizeof (display) - 1, "DISPLAY=%s", compute);
// we only use this check to avoid "tainted string" warnings
u32 compute_len = strnlen (compute, compute_len_max);
u32 display_len_max = sizeof (display);
if (compute_len > 0) // should be always true
u32 display_len = strnlen (display, display_len_max);
if (display_len > 0) // should be always true
{
if (compute_len < compute_len_max) // some upper bound is always good
if (display_len < display_len_max) // some upper bound is always good
{
snprintf (display, compute_len_max, "DISPLAY=%s", compute);
putenv (display);
}
}