From: tbsaunde+binutils@tbsaunde.org
To: binutils@sourceware.org
Cc: Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
Subject: [PATCH] add casts to avoid arithmetic on void *
Date: Thu, 21 Apr 2016 04:44:00 -0000 [thread overview]
Message-ID: <1461214254-29707-1-git-send-email-tbsaunde+binutils@tbsaunde.org> (raw)
From: Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
Hi,
arithmetic on void * is undefined in ISO C, so we should avoid it. In GNU C
sizeof void * is defined as 1, and that is pretty clearly what this code wants,
so change it to do arithmetic on bfd_byte *. Unfortunately most of the
argument types come from virtual function interfaces so changing the
types to bfd_byte * isn't trivial though it might make the code clearer.
So for the moment its easiest to leave the variable types as void * and
cast before doing arithmetic.
built --enable-targets=all, ok?
Trev
bfd/ChangeLog:
2016-04-21 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
* elf32-rx.c (rx_set_section_contents): Avoid arithmetic on void *.
* mmo.c (mmo_get_section_contents): Likewise.
(mmo_set_section_contents): Likewise.
---
bfd/elf32-rx.c | 6 +++---
bfd/mmo.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index 754eae1..147a1a3 100644
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -3548,7 +3548,7 @@ rx_set_section_contents (bfd * abfd,
if (! rv)
return rv;
- location ++;
+ location = (bfd_byte *) location + 1;
offset ++;
count --;
caddr ++;
@@ -3574,7 +3574,7 @@ rx_set_section_contents (bfd * abfd,
}
count -= scount;
- location += scount;
+ location = (bfd_byte *) location + scount;
offset += scount;
if (count > 0)
@@ -3593,7 +3593,7 @@ rx_set_section_contents (bfd * abfd,
if (! rv)
return rv;
- location ++;
+ location = (bfd_byte *) location + 1;
offset ++;
count --;
caddr ++;
diff --git a/bfd/mmo.c b/bfd/mmo.c
index d396fd7..ee22b03 100644
--- a/bfd/mmo.c
+++ b/bfd/mmo.c
@@ -2120,7 +2120,7 @@ mmo_get_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
memcpy (location, loc, chunk_size);
- location += chunk_size;
+ location = (bfd_byte *) location + chunk_size;
bytes_to_do -= chunk_size;
offset += chunk_size;
}
@@ -2657,7 +2657,7 @@ mmo_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec,
memcpy (loc, location, chunk_size);
- location += chunk_size;
+ location = (bfd_byte *) location + chunk_size;
bytes_to_do -= chunk_size;
offset += chunk_size;
}
--
2.1.4
next reply other threads:[~2016-04-21 4:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-21 4:44 tbsaunde+binutils [this message]
2016-04-21 10:38 ` Nick Clifton
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=1461214254-29707-1-git-send-email-tbsaunde+binutils@tbsaunde.org \
--to=tbsaunde+binutils@tbsaunde.org \
--cc=binutils@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).