]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Merge upstream r432:
authordes <des@FreeBSD.org>
Mon, 22 Mar 2010 11:00:57 +0000 (11:00 +0000)
committerdes <des@FreeBSD.org>
Mon, 22 Mar 2010 11:00:57 +0000 (11:00 +0000)
commit333ce73d6abbf8683558547a728f7088acd3b342
tree91345ff9c8439be9d270faf545e1ecc99f4fa622
parenta52af8cfd6b7cd34e34ab9dd42b772901300bf9a
Merge upstream r432:

pam_end() already contains a NULL check, and it is not unreasonable to
call it with a NULL pamh in a cleanup / error-handling situation.  Remove
OPENPAM_NONNULL, which may cause gcc to optimize away the NULL check.

This fixes a potential NULL pointer dereference in error-handling code
in passwd(1).
contrib/openpam/include/security/pam_appl.h