summaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-08-17 10:32:59 -0400
committerUlrich Drepper <drepper@gmail.com>2011-08-17 10:32:59 -0400
commit8de79a248cc1a4148e1e826ed416bb6faee4857b (patch)
tree0a931f53dce071380ee9e424885c1e03cc391b7d /nss
parentc5305d88c7dc519edfaf55eed8d026a9038d7978 (diff)
downloadglibc-8de79a248cc1a4148e1e826ed416bb6faee4857b.tar.gz
Avoid executable stack in makedb
Diffstat (limited to 'nss')
-rw-r--r--nss/makedb.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/nss/makedb.c b/nss/makedb.c
index 8bbebc5469..8cee92f891 100644
--- a/nss/makedb.c
+++ b/nss/makedb.c
@@ -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)
{