Avoid executable stack in makedb

diff --git a/ChangeLog b/ChangeLog
index 6aa670d..189424c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/nss/makedb.c b/nss/makedb.c
index 8bbebc5..8cee92f 100644 (file)
--- 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)
          {