- markus@cvs.openbsd.org 2003/10/15 09:48:45

     [monitor_wrap.c]
     check pmonitor != NULL

diff --git a/ChangeLog b/ChangeLog
index 4b50d6ce9e163c93d324382601df4dc79978dc3f..e2d8e0163baf6661981ae9a61de55ce60f623e1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
  - (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services
    are created correctly with CRLF line terminations.  Patch from vinschen at
    redhat.com.
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2003/10/15 09:48:45
+     [monitor_wrap.c]
+     check pmonitor != NULL
 
 20031021
  - (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords

diff --git a/monitor_wrap.c b/monitor_wrap.c
index e19984ec0cd927a9979a5713f751fa19f0731515..fe14604226b90d489f083aa7337850343b07c62d 100644 (file)
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.33 2003/10/11 11:36:23 markus Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.34 2003/10/15 09:48:45 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
@@ -73,7 +73,7 @@ mm_is_monitor(void)
         * m_pid is only set in the privileged part, and
         * points to the unprivileged child.
         */
-       return (pmonitor->m_pid > 0);
+       return (pmonitor && pmonitor->m_pid > 0);
 }
 
 void