diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-04-07 18:09:40 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-04-07 18:09:40 +0000 |
| commit | 5670bacc392644691373d19999fd2db942d2653c (patch) | |
| tree | ece9fa3fda23de597c0c124cc6db8816dea7e132 /usr.sbin/ospfd/imsg.c | |
| parent | 1193b810e8339e64b525abb97aeb0c8cbd30cd10 (diff) | |
Remove XXX comment and just close received fd if calloc() fails.
If this happens the imsg may no longer be usable as there may be queued
messages, but this is a) already the case with the code now, and b)
would be the case if recvmsg() fails anyway, so we can document that -1
from imsg_read() invalidates the struct imsgbuf.
discussed with and ok eric
Diffstat (limited to 'usr.sbin/ospfd/imsg.c')
| -rw-r--r-- | usr.sbin/ospfd/imsg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ospfd/imsg.c b/usr.sbin/ospfd/imsg.c index dcc257c13f0..64d53ce0b0a 100644 --- a/usr.sbin/ospfd/imsg.c +++ b/usr.sbin/ospfd/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.19 2009/08/08 18:33:40 nicm Exp $ */ +/* $OpenBSD: imsg.c,v 1.20 2010/04/07 18:09:39 nicm Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -79,7 +79,7 @@ imsg_read(struct imsgbuf *ibuf) cmsg->cmsg_type == SCM_RIGHTS) { fd = (*(int *)CMSG_DATA(cmsg)); if ((ifd = calloc(1, sizeof(struct imsg_fd))) == NULL) { - /* XXX: this return can leak */ + close(fd); return (-1); } ifd->fd = fd; |