From 4f1ddfa66e476940dcffe3f9878c48be8d6eb22e Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Mon, 30 Dec 2019 05:59:36 +0100 Subject: [PATCH] mkpasswd: ignore a 0-bytes salt parameter This also prevents a segmentation fault when CRYPT_GENSALT_IMPLEMENTS_DEFAULT_PREFIX is used. Closes #81 from Github. --- mkpasswd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkpasswd.c b/mkpasswd.c index d32391e..c85b1ed 100644 --- a/mkpasswd.c +++ b/mkpasswd.c @@ -282,7 +282,7 @@ int main(int argc, char *argv[]) else rounds_str[0] = '\0'; - if (salt_arg) { + if (salt_arg && salt_arg[0] != '\0') { unsigned int c = strlen(salt_arg); if (c < salt_minlen || c > salt_maxlen) { if (salt_minlen == salt_maxlen)