aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorChristian Göttsche <cgzones@googlemail.com>2024-02-22 16:16:45 +0100
committerDmitry V. Levin <ldv@strace.io>2024-02-22 15:16:45 +0000
commite559de0cdd6134a4b87a79aab6928fb1e8c7194c (patch)
tree7d4e479ab2f440a84061e41337b9cb28587a4b38 /modules
parent2aa449c01f585dcb0be42b23883703c62ee15fae (diff)
downloadpam-e559de0cdd6134a4b87a79aab6928fb1e8c7194c.tar.gz
pam-e559de0cdd6134a4b87a79aab6928fb1e8c7194c.tar.bz2
pam-e559de0cdd6134a4b87a79aab6928fb1e8c7194c.zip
pam_unix: avoid string formatting of NULL
Since the struct member user might be NULL use the same condition for the value as for the preceding key. Reported-by: Yugend
Diffstat (limited to 'modules')
-rw-r--r--modules/pam_unix/support.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c
index 69811048..90f6bbe9 100644
--- a/modules/pam_unix/support.c
+++ b/modules/pam_unix/support.c
@@ -317,7 +317,8 @@ static void _cleanup_failures(pam_handle_t * pamh, void *fl, int err)
tty ? (const char *)tty : "", ruser ? (const char *)ruser : "",
rhost ? (const char *)rhost : "",
(failure->user && failure->user[0] != '\0')
- ? " user=" : "", failure->user
+ ? " user=" : "",
+ failure->user ? failure->user : ""
);
if (failure->count > UNIX_MAX_RETRIES) {
@@ -836,7 +837,7 @@ int _unix_verify_password(pam_handle_t * pamh, const char *name
rhost ? (const char *)rhost : "",
(new->user && new->user[0] != '\0')
? " user=" : "",
- new->user
+ new->user ? new->user : ""
);
new->count = 1;
}