arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-16 02:31:02 +00:00
Code Issues Releases Wiki Activity

Fix for -I parameter workaround, use chdir () before modifying cpath_real

Browse Source 
Fixes https://github.com/hashcat/hashcat/issues/432
This commit is contained in:
jsteube 2016-07-13 11:36:57 +02:00
parent 752e548f4e
commit 2167df6915
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/hashcat.c
View File

@ -16107,12 +16107,6 @@ int main (int argc, char **argv)
return -1; return -1;
} }
naive_replace (cpath_real, '\\', '/');
// not escaping here, windows has quotes
snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s\"", cpath_real);
#else #else
snprintf (cpath, sizeof (cpath) - 1, "%s/OpenCL/", shared_dir); snprintf (cpath, sizeof (cpath) - 1, "%s/OpenCL/", shared_dir);
@ -16126,6 +16120,25 @@ int main (int argc, char **argv)
return -1; return -1;
} }
#endif
if (chdir (cpath_real) == -1)
{
log_error ("ERROR: %s: %s", cpath_real, strerror (errno));
return -1;
}
#if _WIN
naive_replace (cpath_real, '\\', '/');
// not escaping here, windows has quotes
snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s\"", cpath_real);
#else
naive_escape (cpath_real, PATH_MAX, ' ', '\\'); naive_escape (cpath_real, PATH_MAX, ' ', '\\');
snprintf (build_opts, sizeof (build_opts) - 1, "-I %s", cpath_real); snprintf (build_opts, sizeof (build_opts) - 1, "-I %s", cpath_real);
@ -16157,13 +16170,6 @@ int main (int argc, char **argv)
"inc_vendor.cl", "inc_vendor.cl",
}; };
if (chdir (cpath_real) == -1)
{
log_error ("ERROR: %s: %s", cpath_real, strerror (errno));
return -1;
}
for (int i = 0; i < files_cnt; i++) for (int i = 0; i < files_cnt; i++)
{ {
FILE *fd = fopen (files_names[i], "r"); FILE *fd = fopen (files_names[i], "r");