diff options
| author | Tomas Mraz <tm@t8m.info> | 2009-06-01 07:07:35 +0000 |
|---|---|---|
| committer | Tomas Mraz <tm@t8m.info> | 2009-06-01 07:07:35 +0000 |
| commit | 87d1508a7362e2f213a90b30a6e5bd72f47d6060 (patch) | |
| tree | b6b77fc925d52d3c507f2cd3d2eebe7a2482c5c8 /modules/pam_pwhistory/opasswd.c | |
| parent | fbd40f8764ac17611e1e7f9464565a1b3e7792a2 (diff) | |
| download | pam-87d1508a7362e2f213a90b30a6e5bd72f47d6060.tar.gz pam-87d1508a7362e2f213a90b30a6e5bd72f47d6060.tar.bz2 pam-87d1508a7362e2f213a90b30a6e5bd72f47d6060.zip | |
Relevant BUGIDs:
Purpose of commit: bugfix
Commit summary:
---------------
2009-06-01 Tomáš Mráz <t8m@centrum.cz>
* modules/pam_pwhistory/opasswd.c (save_old_password): Don't
call fclose() on NULL descriptor. Found by Steve Grubb.
Diffstat (limited to 'modules/pam_pwhistory/opasswd.c')
| -rw-r--r-- | modules/pam_pwhistory/opasswd.c | 6 |
1 files changed, 4 insertions, 2 deletions
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; |