From 6f07d0d947f0d699a35264a8f4b0e4cfc2044c09 Mon Sep 17 00:00:00 2001 From: jsteube Date: Tue, 25 Oct 2016 11:36:17 +0200 Subject: [PATCH] Fix https://github.com/hashcat/hashcat/issues/547 --- src/user_options.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/user_options.c b/src/user_options.c index 061bab63c..a4cb1f165 100644 --- a/src/user_options.c +++ b/src/user_options.c @@ -415,9 +415,12 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx) { if (user_options->outfile_format_chgd == true) { - event_log_error (hashcat_ctx, "Mixing outfile-format > 1 with left parameter is not allowed"); + if (user_options->outfile_format > 1) + { + event_log_error (hashcat_ctx, "Mixing outfile-format > 1 with left parameter is not allowed"); - return -1; + return -1; + } } } @@ -425,9 +428,12 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx) { if (user_options->outfile_format_chgd == true) { - event_log_error (hashcat_ctx, "Mixing outfile-format > 7 with show parameter is not allowed"); + if (user_options->outfile_format > 7) + { + event_log_error (hashcat_ctx, "Mixing outfile-format > 7 with show parameter is not allowed"); - return -1; + return -1; + } } }