commit 982de674c9fac89418509c048548471435c0c7df
author Robert CH Chou <Robert_CH_Chou@acer.com.tw> Sun Jun 05 00:49:42 2011 +0800
committer Dmitry Shmidt <dimitrysh@google.com> Mon Jun 06 11:25:16 2011 -0700
tree 19029d58ff2ce205284b1bed9e64d4210af3123c
parent 1a441f49ec87ef74b978d7ae17da2a9b2ca6e811

fix file descriptors leaking

Change-Id: Ie76d19b279972dfd4e78bfc5fe5a302bf23de13b

ip/iproute.c

diff --git a/ip/iproute.c b/ip/iproute.c
index 711576e..16dee80 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -1028,6 +1028,7 @@
 
 	if ((write (flush_fd, (void *)buffer, len)) < len) {
 		fprintf (stderr, "Cannot flush routing cache\n");
+		close(flush_fd);
 		return -1;
 	}
 	close(flush_fd);

ip/iptunnel.c

diff --git a/ip/iptunnel.c b/ip/iptunnel.c
index 3525fbb..7c682a7 100644
--- a/ip/iptunnel.c
+++ b/ip/iptunnel.c
@@ -421,6 +421,7 @@
 		if ((ptr = strchr(buf, ':')) == NULL ||
 		    (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
 			fprintf(stderr, "Wrong format of /proc/net/dev. Sorry.\n");
+			fclose(fp);
 			return -1;
 		}
 		if (sscanf(ptr, "%ld%ld%ld%ld%ld%ld%ld%*d%ld%ld%ld%ld%ld%ld%ld",
@@ -459,6 +460,7 @@
 		}
 		printf("\n");
 	}
+	fclose(fp);
 	return 0;
 }
 

lib/rt_names.c

diff --git a/lib/rt_names.c b/lib/rt_names.c
index 52edfe3..89b1cc3 100644
--- a/lib/rt_names.c
+++ b/lib/rt_names.c
@@ -54,6 +54,7 @@
 		    sscanf(p, "%d %s #", &id, namebuf) != 2) {
 			fprintf(stderr, "Database %s is corrupted at %s\n",
 				file, p);
+			fclose(fp);
 			return;
 		}
 
@@ -91,6 +92,7 @@
 		    sscanf(p, "%d %s #", &id, namebuf) != 2) {
 			fprintf(stderr, "Database %s is corrupted at %s\n",
 				file, p);
+			fclose(fp);
 			return;
 		}