diff options
| author | Roland McGrath <roland@gnu.org> | 2005-07-18 02:48:38 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-07-18 02:48:38 +0000 |
| commit | 6bdd7b167ed9becf3b3731a3b147a6c6a4631bd8 (patch) | |
| tree | bdc3bf32211af905137085d2e5f1a76c8b931b64 | |
| parent | 9e416865e41f1f5710cc2433edc0d943043d666c (diff) | |
| download | glibc-6bdd7b167ed9becf3b3731a3b147a6c6a4631bd8.tar.gz glibc-6bdd7b167ed9becf3b3731a3b147a6c6a4631bd8.tar.xz glibc-6bdd7b167ed9becf3b3731a3b147a6c6a4631bd8.zip | |
2005-04-29 Ulrich Drepper <drepper@redhat.com>
[BZ #1093] * nis/nis_table.c: Fix realloc handling. * nis/nis_removemember.c: Likewise.
| -rw-r--r-- | nis/nis_removemember.c | 10 | ||||
| -rw-r--r-- | nis/nis_table.c | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/nis/nis_removemember.c b/nis/nis_removemember.c index b9e27ab48c..0ad2213387 100644 --- a/nis/nis_removemember.c +++ b/nis/nis_removemember.c @@ -92,9 +92,13 @@ nis_removemember (const_nis_name member, const_nis_name group) /* This realloc() call always decreases the size. This cannot fail. We still have the test but do not recover memory (i.e., we overwrite the input pointer). */ - newmem = realloc (newmem, k * sizeof (char*)); - if (newmem == NULL) - return NIS_NOMEMORY; + nis_name *newp = realloc (newmem, k * sizeof (char*)); + if (newp == NULL) + { + free (newmem); + return NIS_NOMEMORY; + } + newmem = newp; NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val = newmem; NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_len = k; diff --git a/nis/nis_table.c b/nis/nis_table.c index 13acdfdf50..f746b7c629 100644 --- a/nis/nis_table.c +++ b/nis/nis_table.c @@ -94,9 +94,10 @@ __create_ib_request (const_nis_name name, unsigned int flags) if ((search_len + 1) >= size) { size += 1; - search_val = realloc (search_val, size * sizeof (nis_attr)); - if (search_val == NULL) + nis_attr *newp = realloc (search_val, size * sizeof (nis_attr)); + if (newp == NULL) goto free_null; + search_val = newp; } search_val[search_len].zattr_ndx = strdup (key); if ((search_val[search_len].zattr_ndx) == NULL) |