diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-05-07 03:57:57 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-05-07 03:57:57 +0000 |
| commit | 9be31a514921c7415d61834ffa1387f24f631dfb (patch) | |
| tree | e6d77813cd31858a49c7315b98510e3e3fc06c13 /sysdeps | |
| parent | f1debaf68214cb898f67355ee83169cc135e14e9 (diff) | |
| download | glibc-9be31a514921c7415d61834ffa1387f24f631dfb.tar.gz glibc-9be31a514921c7415d61834ffa1387f24f631dfb.tar.xz glibc-9be31a514921c7415d61834ffa1387f24f631dfb.zip | |
Update.
* sysdeps/unix/sysv/linux/ifreq.c (__ifreq): Fix memory handling. * sysdeps/generic/ifreq.c (__ifreq): Fix memory handling. * resolv/res_hconf.c (_res_hconf_reorder_addrs): Make clear that realloc cannot fail. * nss/nss_files/files-netgrp.c (EXPAND): Free buffer which cannot be expanded. * nis/nis_table.c: Clean up memory handling. * nis/nis_subr.c (nis_getnames): Clean up memory handling. * nis/nis_removemember.c (nis_removemember): Add comment explaining use of realloc.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ifreq.c | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ifreq.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sysdeps/generic/ifreq.c b/sysdeps/generic/ifreq.c index da4db19e6f..55e833bdb3 100644 --- a/sysdeps/generic/ifreq.c +++ b/sysdeps/generic/ifreq.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger <aj@suse.de>. @@ -43,11 +43,10 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) do { ifc.ifc_len = rq_len *= 2; - ifc.ifc_buf = realloc (ifc.ifc_buf, ifc.ifc_len); - if (ifc.ifc_buf == NULL || __ioctl (fd, SIOCGIFCONF, &ifc) < 0) + void *newp = realloc (ifc.ifc_buf, ifc.ifc_len); + if (newp == NULL || __ioctl (fd, SIOCGIFCONF, &ifc) < 0) { - if (ifc.ifc_buf) - free (ifc.ifc_buf); + free (ifc.ifc_buf); if (fd != sockfd) __close (fd); @@ -55,6 +54,7 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) *ifreqs = NULL; return; } + ifc.ifc_buf = newp; } while (rq_len < sizeof (struct ifreq) + ifc.ifc_len); diff --git a/sysdeps/unix/sysv/linux/ifreq.c b/sysdeps/unix/sysv/linux/ifreq.c index 5ab5b06397..b93cd56eab 100644 --- a/sysdeps/unix/sysv/linux/ifreq.c +++ b/sysdeps/unix/sysv/linux/ifreq.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger <aj@suse.de>. @@ -70,11 +70,10 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) while (1) { ifc.ifc_len = rq_len; - ifc.ifc_buf = realloc (ifc.ifc_buf, ifc.ifc_len); - if (ifc.ifc_buf == NULL || __ioctl (fd, SIOCGIFCONF, &ifc) < 0) + void *newp = realloc (ifc.ifc_buf, ifc.ifc_len); + if (newp == NULL || __ioctl (fd, SIOCGIFCONF, &ifc) < 0) { - if (ifc.ifc_buf) - free (ifc.ifc_buf); + free (ifc.ifc_buf); if (fd != sockfd) __close (fd); @@ -83,6 +82,7 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) *ifreqs = NULL; return; } + ifc.ifc_buf = newp; if (!old_siocgifconf || ifc.ifc_len < rq_len) break; |