From: Andreas Schwab <schwab@redhat.com>
To: libc-hacker@sourceware.org
Subject: [PATCH] Avoid executable stack in makedb
Date: Wed, 17 Aug 2011 12:08:00 -0000 [thread overview]
Message-ID: <m31uwk1brr.fsf@hase.home> (raw)
2011-08-17 Andreas Schwab <schwab@redhat.com>
* nss/makedb.c (compute_tables): Make variables used in nested
function static.
---
nss/makedb.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/nss/makedb.c b/nss/makedb.c
index 8bbebc5..8cee92f 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)
{
--
1.7.6
--
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E
"And now for something completely different."
reply other threads:[~2011-08-17 12:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m31uwk1brr.fsf@hase.home \
--to=schwab@redhat.com \
--cc=libc-hacker@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).