aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-12-29 15:57:15 +0000
committerUlrich Drepper <drepper@redhat.com>2001-12-29 15:57:15 +0000
commitd1dddedf7893fe70ed5d429485c8bcd0ab43f285 (patch)
tree99420c13234130854769150b8d81f5fe1d2528e3 /elf
parent9403ec5d23e7dc209361b3dbae2fdc184e1684aa (diff)
downloadglibc-d1dddedf7893fe70ed5d429485c8bcd0ab43f285.tar
glibc-d1dddedf7893fe70ed5d429485c8bcd0ab43f285.tar.gz
glibc-d1dddedf7893fe70ed5d429485c8bcd0ab43f285.tar.bz2
glibc-d1dddedf7893fe70ed5d429485c8bcd0ab43f285.zip
Realloc error handling memory leak fix.
Diffstat (limited to 'elf')
-rw-r--r--elf/chroot_canon.c19
-rw-r--r--elf/dl-object.c11
2 files changed, 21 insertions, 9 deletions
diff --git a/elf/chroot_canon.c b/elf/chroot_canon.c
index 383c72e651..6b7e444800 100644
--- a/elf/chroot_canon.c
+++ b/elf/chroot_canon.c
@@ -1,5 +1,5 @@
/* Return the canonical absolute name of a given file inside chroot.
- Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -42,8 +42,13 @@
char *
chroot_canon (const char *chroot, const char *name)
{
- char *rpath, *dest, *extra_buf = NULL, *rpath_root;
- const char *start, *end, *rpath_limit;
+ char *rpath;
+ char *dest;
+ char *extra_buf = NULL;
+ char *rpath_root;
+ const char *start;
+ const char *end;
+ const char *rpath_limit;
int num_links = 0;
size_t chroot_len = strlen (chroot);
@@ -94,16 +99,18 @@ chroot_canon (const char *chroot, const char *name)
if (dest + (end - start) >= rpath_limit)
{
ptrdiff_t dest_offset = dest - rpath;
+ char *new_rpath;
new_size = rpath_limit - rpath;
if (end - start + 1 > PATH_MAX)
new_size += end - start + 1;
else
new_size += PATH_MAX;
- rpath = realloc (rpath, new_size);
- rpath_limit = rpath + new_size;
- if (rpath == NULL)
+ new_rpath = (char *) realloc (rpath, new_size);
+ if (new_rpath == NULL)
return NULL;
+ rpath = new_rpath;
+ rpath_limit = rpath + new_size;
dest = rpath + dest_offset;
}
diff --git a/elf/dl-object.c b/elf/dl-object.c
index ed78b47127..eee9deb3d2 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -121,11 +121,16 @@ _dl_new_object (char *realname, const char *libname, int type,
origin = NULL;
do
{
+ char *new_origin;
+
len += 128;
- origin = (char *) realloc (origin, len);
+ new_origin = (char *) realloc (origin, len);
+ if (new_origin == NULL)
+ /* We exit the loop. Note that result == NULL. */
+ break;
+ origin = new_origin;
}
- while (origin != NULL
- && (result = __getcwd (origin, len - realname_len)) == NULL
+ while ((result = __getcwd (origin, len - realname_len)) == NULL
&& errno == ERANGE);
if (result == NULL)