matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix file descriptor leak in do_tunnels_list() 

Detected by cppcheck.

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
This commit is contained in:
Thomas Jarosch 2011-10-03 05:24:32 +00:00 committed by Stephen Hemminger
parent e588a7db16
commit 297452a1c2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ip/iptunnel.c
View File

@ -411,6 +411,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
if (!fgets(buf, sizeof(buf), fp) || if (!fgets(buf, sizeof(buf), fp) ||
!fgets(buf, sizeof(buf), fp)) { !fgets(buf, sizeof(buf), fp)) {
fprintf(stderr, "/proc/net/dev read error\n"); fprintf(stderr, "/proc/net/dev read error\n");
fclose(fp);
return -1; return -1;
} }
@ -421,6 +422,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
if ((ptr = strchr(buf, ':')) == NULL || if ((ptr = strchr(buf, ':')) == NULL ||
(*ptr++ = 0, sscanf(buf, "%s", name) != 1)) { (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
fprintf(stderr, "Wrong format of /proc/net/dev. Sorry.\n"); fprintf(stderr, "Wrong format of /proc/net/dev. Sorry.\n");
fclose(fp);
return -1; return -1;
} }
if (sscanf(ptr, "%ld%ld%ld%ld%ld%ld%ld%*d%ld%ld%ld%ld%ld%ld%ld", if (sscanf(ptr, "%ld%ld%ld%ld%ld%ld%ld%*d%ld%ld%ld%ld%ld%ld%ld",
@ -462,6 +464,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
} }
printf("\n"); printf("\n");
} }
fclose(fp);
return 0; return 0;
} }