From 83a75cff45f34d07ccff93034acb2544498d4f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Sun, 16 Feb 2003 11:28:55 +0000
Subject: [PATCH] MFP4: guard against null pointer dereference which sshd can
 cause (#25271)

---
 contrib/openpam/lib/pam_vprompt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/openpam/lib/pam_vprompt.c b/contrib/openpam/lib/pam_vprompt.c
index 15fdc8176998..83262c472c14 100644
--- a/contrib/openpam/lib/pam_vprompt.c
+++ b/contrib/openpam/lib/pam_vprompt.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_vprompt.c#8 $
+ * $P4: //depot/projects/openpam/lib/pam_vprompt.c#9 $
  */
 
 #include <stdarg.h>
@@ -66,7 +66,7 @@ pam_vprompt(pam_handle_t *pamh,
 	r = pam_get_item(pamh, PAM_CONV, (const void **)&conv);
 	if (r != PAM_SUCCESS)
 		RETURNC(r);
-	if (conv == NULL) {
+	if (conv == NULL || conv->conv == NULL) {
 		openpam_log(PAM_LOG_ERROR, "no conversation function");
 		RETURNC(PAM_SYSTEM_ERR);
 	}