diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | monitor_fdpass.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -18,6 +18,9 @@ - jmc@cvs.openbsd.org 2004/08/13 00:01:43 [ssh-keygen.1] kill whitespace at eol; + - djm@cvs.openbsd.org 2004/08/13 02:51:48 + [monitor_fdpass.c] + extra check for no message case; ok markus, deraadt, hshoexer, henning 20040812 - (dtucker) [sshd.c] Remove duplicate variable imported during sync. @@ -1615,4 +1618,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3503 2004/08/13 11:23:25 dtucker Exp $ +$Id: ChangeLog,v 1.3504 2004/08/13 11:29:02 dtucker Exp $ diff --git a/monitor_fdpass.c b/monitor_fdpass.c index f0dd88e7..dd1a1398 100644 --- a/monitor_fdpass.c +++ b/monitor_fdpass.c @@ -24,7 +24,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor_fdpass.c,v 1.5 2004/06/21 17:36:31 avsm Exp $"); +RCSID("$OpenBSD: monitor_fdpass.c,v 1.6 2004/08/13 02:51:48 djm Exp $"); #include <sys/uio.h> @@ -113,6 +113,8 @@ mm_receive_fd(int sock) fatal("%s: no fd", __func__); #else cmsg = CMSG_FIRSTHDR(&msg); + if (cmsg == NULL) + fatal("%s: no message header", __func__); #ifndef BROKEN_CMSG_TYPE if (cmsg->cmsg_type != SCM_RIGHTS) fatal("%s: expected type %d got %d", __func__, |