* malloc/malloc.c (_int_malloc): Remove unused any_larger variable.
* nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. * sysdeps/generic/unsecvars.h: Add NIS_PATH.
This commit is contained in:
parent
8099361ecd
commit
6c7e1cf59e
|
@ -1,3 +1,12 @@
|
|||
2006-10-11 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* malloc/malloc.c (_int_malloc): Remove unused any_larger variable.
|
||||
|
||||
* nis/nis_defaults.c (__nis_default_access): Don't call getenv twice.
|
||||
|
||||
* nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv.
|
||||
* sysdeps/generic/unsecvars.h: Add NIS_PATH.
|
||||
|
||||
2006-10-11 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* include/atomic.c: Define catomic_* operations.
|
||||
|
|
|
@ -4097,7 +4097,6 @@ _int_malloc(mstate av, size_t bytes)
|
|||
for(;;) {
|
||||
|
||||
int iters = 0;
|
||||
bool any_larger = false;
|
||||
while ( (victim = unsorted_chunks(av)->bk) != unsorted_chunks(av)) {
|
||||
bck = victim->bk;
|
||||
if (__builtin_expect (victim->size <= 2 * SIZE_SZ, 0)
|
||||
|
@ -4194,8 +4193,6 @@ _int_malloc(mstate av, size_t bytes)
|
|||
fwd->bk = victim;
|
||||
bck->fd = victim;
|
||||
|
||||
if (size >= nb + MINSIZE)
|
||||
any_larger = true;
|
||||
#define MAX_ITERS 10000
|
||||
if (++iters >= MAX_ITERS)
|
||||
break;
|
||||
|
|
|
@ -447,7 +447,7 @@ __nis_default_access (char *param, unsigned int defaults)
|
|||
{
|
||||
cptr = getenv ("NIS_DEFAULTS");
|
||||
if (cptr != NULL && strstr (cptr, "access=") != NULL)
|
||||
result = searchaccess (getenv ("NIS_DEFAULTS"), result);
|
||||
result = searchaccess (cptr, result);
|
||||
}
|
||||
|
||||
return result;
|
||||
|
|
|
@ -178,7 +178,7 @@ nis_getnames (const_nis_name name)
|
|||
}
|
||||
|
||||
/* Get the search path, where we have to search "name" */
|
||||
path = getenv ("NIS_PATH");
|
||||
path = __secure_getenv ("NIS_PATH");
|
||||
if (path == NULL)
|
||||
path = strdupa ("$");
|
||||
else
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
"LOCALDOMAIN\0" \
|
||||
"LOCPATH\0" \
|
||||
"MALLOC_TRACE\0" \
|
||||
"NIS_PATH\0" \
|
||||
"NLSPATH\0" \
|
||||
"RESOLV_HOST_CONF\0" \
|
||||
"RES_OPTIONS\0" \
|
||||
|
|
Loading…
Reference in New Issue