aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elflink.c11
2 files changed, 11 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2ed0e4a..fba19d2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-12 Nick Clifton <nickc@redhat.com>
+
+ PR 5160
+ * elflink.c (eval_symbol): Remove bufsz variable and use
+ sizeof(symbuf) where necessary.
+
2007-10-12 M R Swami Reddy <MR.Swami.Reddy@nsc.com>
* elf32-cr16.c (elf32_cr16_relax_section): Fix condition check typo.
diff --git a/bfd/elflink.c b/bfd/elflink.c
index bdcccbb..49d75b0 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -7389,12 +7389,11 @@ eval_symbol (bfd_vma *result,
size_t locsymcount,
int signed_p)
{
- int len;
- int symlen;
+ size_t len;
+ size_t symlen;
bfd_vma a;
bfd_vma b;
- const int bufsz = 4096;
- char symbuf[bufsz];
+ char symbuf[4096];
const char *sym = *symp;
const char *symend;
bfd_boolean symbol_is_section = FALSE;
@@ -7402,7 +7401,7 @@ eval_symbol (bfd_vma *result,
len = strlen (sym);
symend = sym + len;
- if (len < 1 || len > bufsz)
+ if (len < 1 || len > sizeof (symbuf))
{
bfd_set_error (bfd_error_invalid_operation);
return FALSE;
@@ -7427,7 +7426,7 @@ eval_symbol (bfd_vma *result,
symlen = strtol (sym, (char **) symp, 10);
sym = *symp + 1; /* Skip the trailing ':'. */
- if (symend < sym || symlen + 1 > bufsz)
+ if (symend < sym || symlen + 1 > sizeof (symbuf))
{
bfd_set_error (bfd_error_invalid_operation);
return FALSE;