From e27c6cc3adceec08bb72d4c872a04598e9ae6b41 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 16 May 2003 18:21:01 +1000
Subject:  - (djm) Guard free_pam_environment against NULL argument. Works
 around    HP/UX PAM problems debugged by dtucker

---
 ChangeLog  | 4 +++-
 auth-pam.c | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e7a7c6616..2bcec0445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@
      Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@
  - (djm) Add warning for UsePAM when built without PAM support
  - (djm) A few type mismatch fixes from Bug #565
+ - (djm) Guard free_pam_environment against NULL argument. Works around
+   HP/UX PAM problems debugged by dtucker
 
 20030515
  - (djm) OpenBSD CVS Sync
@@ -1547,4 +1549,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2729 2003/05/16 05:51:44 djm Exp $
+$Id: ChangeLog,v 1.2730 2003/05/16 08:21:01 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 34326c242..dc4116175 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -648,6 +648,9 @@ free_pam_environment(char **env)
 {
 	char **envp;
 
+	if (env == NULL)
+		return;
+
 	for (envp = env; *envp; envp++)
 		xfree(*envp);
 	xfree(env);
-- 
cgit v1.2.3