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

Merge pull request #3456 from davidbolvansky/escape_fields_json

Browse Source 
Escape some fields of --status-json output
This commit is contained in:
Jens Steube 2022-09-11 17:02:10 +02:00 committed by GitHub
commit 7a5ea7e255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/terminal.c
View File

@ -1826,12 +1826,25 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
end = time_now + sec_etc; end = time_now + sec_etc;
} }
printf ("{ \"session\": \"%s\",", hashcat_status->session); char *session_json_encoded = (char *) hcmalloc (strlen (hashcat_status->session) * 2);
json_encode (hashcat_status->session, session_json_encoded);
printf ("{ \"session\": \"%s\",", session_json_encoded);
hcfree (session_json_encoded);
printf (" \"guess\": {"); printf (" \"guess\": {");
if (hashcat_status->guess_base) if (hashcat_status->guess_base)
{ {
printf (" \"guess_base\": \"%s\",", hashcat_status->guess_base); char *guess_base_json_encoded = (char *) hcmalloc (strlen (hashcat_status->guess_base) * 2);
json_encode (hashcat_status->guess_base, guess_base_json_encoded);
printf (" \"guess_base\": \"%s\",", guess_base_json_encoded);
hcfree (guess_base_json_encoded);
} }
else else
{ {
@ -1845,7 +1858,13 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
if (hashcat_status->guess_mod) if (hashcat_status->guess_mod)
{ {
printf (" \"guess_mod\": \"%s\",", hashcat_status->guess_mod); char *guess_mod_json_encoded = (char *) hcmalloc (strlen (hashcat_status->guess_mod) * 2);
json_encode (hashcat_status->guess_mod, guess_mod_json_encoded);
printf (" \"guess_mod\": \"%s\",", guess_mod_json_encoded);
hcfree (guess_mod_json_encoded);
} }
else else
{ {