summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2006-04-05 18:17:31 +0000
committerwiz <wiz>2006-04-05 18:17:31 +0000
commit434cea040123d4d6fbb21bcb5ede87d941b355fc (patch)
tree506d8a7f6c3a8516342f461c394f73735e22c1ed
parentc5629dffb8bad82ae1f7f8900eddab7c1877b7f5 (diff)
downloadpkgsrc-434cea040123d4d6fbb21bcb5ede87d941b355fc.tar.gz
Sync with src/usr.sbin v1.70:
http_expand_URL(): fclose() the fdopen()'ed filedescriptor before leaving the function (for all cases). Actual fix and sanity checking by Dillo & Wiz Coverity CID 2340
-rw-r--r--pkgtools/pkg_install/files/lib/ftpio.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgtools/pkg_install/files/lib/ftpio.c b/pkgtools/pkg_install/files/lib/ftpio.c
index 08a8f4b6981..dd347ec1b23 100644
--- a/pkgtools/pkg_install/files/lib/ftpio.c
+++ b/pkgtools/pkg_install/files/lib/ftpio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpio.c,v 1.18 2005/10/30 21:27:47 joerg Exp $ */
+/* $NetBSD: ftpio.c,v 1.19 2006/04/05 18:17:31 wiz Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#endif
#ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.18 2005/10/30 21:27:47 joerg Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.19 2006/04/05 18:17:31 wiz Exp $");
#endif
/*-
@@ -827,6 +827,8 @@ http_expand_URL(const char *base, char *pattern)
}
+ fclose(fp);
+
/* wait for child to exit */
if (waitpid(pid, &state, 0) < 0) {
/* error has been reported by child */