From 87d1508a7362e2f213a90b30a6e5bd72f47d6060 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Mon, 1 Jun 2009 07:07:35 +0000 Subject: Relevant BUGIDs: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Purpose of commit: bugfix Commit summary: --------------- 2009-06-01 Tomáš Mráz * modules/pam_pwhistory/opasswd.c (save_old_password): Don't call fclose() on NULL descriptor. Found by Steve Grubb. --- ChangeLog | 5 +++++ modules/pam_pwhistory/opasswd.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 105be775..9172391c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-06-01 Tomáš Mráz + + * modules/pam_pwhistory/opasswd.c (save_old_password): Don't + call fclose() on NULL descriptor. Found by Steve Grubb. + 2009-06-01 Ville Skyttä * modules/pam_limits/pam_limits.8.xml: Only *.conf diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c index dbcd04e3..3c8e5cff 100644 --- a/modules/pam_pwhistory/opasswd.c +++ b/modules/pam_pwhistory/opasswd.c @@ -244,7 +244,8 @@ save_old_password (pam_handle_t *pamh, const char *user, uid_t uid, { pam_syslog (pamh, LOG_ERR, "Cannot create %s temp file: %m", OLD_PASSWORDS_FILE); - fclose (oldpf); + if (oldpf) + fclose (oldpf); return PAM_AUTHTOK_ERR; } if (do_create) @@ -273,7 +274,8 @@ save_old_password (pam_handle_t *pamh, const char *user, uid_t uid, if (newpf == NULL) { pam_syslog (pamh, LOG_ERR, "Cannot fdopen %s: %m", opasswd_tmp); - fclose (oldpf); + if (oldpf) + fclose (oldpf); close (newpf_fd); retval = PAM_AUTHTOK_ERR; goto error_opasswd; -- cgit v1.2.3