AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid executable stack in makedb

Browse Source
This commit is contained in:
Andreas Schwab 2011-08-17 10:32:59 -04:00 committed by Ulrich Drepper
parent c5305d88c7
commit 8de79a248c
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-17 Andreas Schwab <schwab@redhat.com>
* nss/makedb.c (compute_tables): Make variables used in nested
function static.
2011-08-17 Ulrich Drepper <drepper@gmail.com>
* elf/pldd-xx.c (r_debug): Explicitly add padding when needed.

12
nss/makedb.c
View File

@ -619,7 +619,8 @@ compute_tables (void)
valstrtab[valstrlen++] = '\0';
twalk (valstrtree, copy_valstr);
for (struct database *db = databases; db != NULL; db = db->next)
static struct database *db;
for (db = databases; db != NULL; db = db->next)
if (db->nentries != 0)
{
++ndatabases;
@ -640,10 +641,10 @@ compute_tables (void)
db->keyidxtab = db->hashtable + nhashentries_max;
db->keystrtab = (char *) (db->keyidxtab + nhashentries_max);
size_t max_chainlength;
char *wp;
size_t nhashentries;
bool copy_string = false;
static size_t max_chainlength;
static char *wp;
static size_t nhashentries;
static bool copy_string;
void add_key(const void *nodep, const VISIT which, const int depth)
{
@ -679,6 +680,7 @@ compute_tables (void)
max_chainlength = MAX (max_chainlength, chainlength);
}
copy_string = false;
nhashentries = nhashentries_min;
for (size_t cnt = 0; cnt < TEST_RANGE; ++cnt)
{