diff options
| author | dtucker <dtucker> | 2004-08-13 11:29:02 +0000 |
|---|---|---|
| committer | dtucker <dtucker> | 2004-08-13 11:29:02 +0000 |
| commit | ec7c66c0f48240cb982f5adacd762dc32412a44f (patch) | |
| tree | 2a4c41e2c92c9d1bbfe3a9aa22bd63f23d343845 /monitor_fdpass.c | |
| parent | 3c1540e4095f8319217fa2d8168eead1caef36e5 (diff) | |
| download | openssh-ec7c66c0f48240cb982f5adacd762dc32412a44f.tar.gz | |
- djm@cvs.openbsd.org 2004/08/13 02:51:48
[monitor_fdpass.c]
extra check for no message case; ok markus, deraadt, hshoexer, henning
Diffstat (limited to 'monitor_fdpass.c')
| -rw-r--r-- | monitor_fdpass.c | 4 |
1 files changed, 3 insertions, 1 deletions
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__, |