mirror of
https://github.com/hashcat/hashcat.git
synced 2025-01-11 16:21:12 +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:
commit
5d14e04f9c
12
src/shared.c
12
src/shared.c
@ -258,18 +258,18 @@ void setup_environment_variables ()
|
|||||||
{
|
{
|
||||||
static char display[100];
|
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
|
// 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);
|
putenv (display);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user