diff options
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_imsg.c')
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_imsg.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/net/openbgpd/files/patch-bgpd_imsg.c b/net/openbgpd/files/patch-bgpd_imsg.c index 3bc2bb9a90b..0cd9ad061d2 100644 --- a/net/openbgpd/files/patch-bgpd_imsg.c +++ b/net/openbgpd/files/patch-bgpd_imsg.c @@ -2,16 +2,25 @@ Index: bgpd/imsg.c =================================================================== RCS file: /home/cvs/private/hrs/openbgpd/bgpd/imsg.c,v retrieving revision 1.1.1.6 -retrieving revision 1.1.1.7 -diff -u -p -r1.1.1.6 -r1.1.1.7 +retrieving revision 1.1.1.8 +diff -u -p -r1.1.1.6 -r1.1.1.8 --- bgpd/imsg.c 14 Feb 2010 20:19:57 -0000 1.1.1.6 -+++ bgpd/imsg.c 14 Feb 2010 20:27:06 -0000 1.1.1.7 ++++ bgpd/imsg.c 10 Apr 2010 12:13:04 -0000 1.1.1.8 @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.47 2009/06/08 08:30:06 dlg Exp $ */ -+/* $OpenBSD: imsg.c,v 1.48 2009/08/08 18:33:40 nicm Exp $ */ ++/* $OpenBSD: imsg.c,v 1.49 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; @@ -263,6 +263,9 @@ imsg_flush(struct imsgbuf *ibuf) void imsg_clear(struct imsgbuf *ibuf) |