From fdf14ae2e653f275c085329b183373e1fb062693 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 5 Sep 2009 23:37:40 +0200 Subject: do not save/restore errno around free() calls In any non-buggy program free() does not fail. And when it fails in a buggy program, the failure is usually fatal (heap corruption and segfault). Signed-off-by: Denys Vlasenko --- libc/inet/if_index.c | 15 ++++----------- libc/inet/ifaddrs.c | 5 +---- 2 files changed, 5 insertions(+), 15 deletions(-) (limited to 'libc/inet') diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c index 4100bbf17..090b52a15 100644 --- a/libc/inet/if_index.c +++ b/libc/inet/if_index.c @@ -35,14 +35,6 @@ #include "netlinkaccess.h" -/* Experimentally off - libc_hidden_proto(strncpy) */ -/* Experimentally off - libc_hidden_proto(strdup) */ -/* libc_hidden_proto(ioctl) */ -/* libc_hidden_proto(close) */ -#if __ASSUME_NETLINK_SUPPORT -/* Experimentally off - libc_hidden_proto(strndup) */ -#endif - extern int __opensock(void) attribute_hidden; /* libc_hidden_proto(if_nametoindex) */ @@ -62,10 +54,11 @@ if_nametoindex(const char* ifname) strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl (fd, SIOCGIFINDEX, &ifr) < 0) { - int saved_errno = errno; + // close never fails here, fd is just a unconnected socket + //int saved_errno = errno; close(fd); - if (saved_errno == EINVAL) - __set_errno(ENOSYS); + //if (saved_errno == EINVAL) + // __set_errno(ENOSYS); return 0; } diff --git a/libc/inet/ifaddrs.c b/libc/inet/ifaddrs.c index 1d54d5123..77ca7ce02 100644 --- a/libc/inet/ifaddrs.c +++ b/libc/inet/ifaddrs.c @@ -81,7 +81,6 @@ void __netlink_free_handle (struct netlink_handle *h) { struct netlink_res *ptr; - int saved_errno = errno; ptr = h->nlm_list; while (ptr != NULL) @@ -89,11 +88,9 @@ __netlink_free_handle (struct netlink_handle *h) struct netlink_res *tmpptr; tmpptr = ptr->next; - free (ptr); + free (ptr); /* doesn't affect errno */ ptr = tmpptr; } - - __set_errno (saved_errno); } -- cgit v1.2.3