diff options
| author | Trevor Saunders <tbsaunde+binutils@tbsaunde.org> | 2016-04-13 05:17:31 -0400 |
|---|---|---|
| committer | Trevor Saunders <tbsaunde+binutils@tbsaunde.org> | 2016-04-26 20:09:57 -0400 |
| commit | 28cc9170c3d0bc0c5e82b45a10015e4bbcb01125 (patch) | |
| tree | 39cc9b5d7af7877b58da8d4a2e8cf708a7cf64fd | |
| parent | ffbad59e36154c69cd95d2ed59223e9449206314 (diff) | |
| download | gdb-28cc9170c3d0bc0c5e82b45a10015e4bbcb01125.zip gdb-28cc9170c3d0bc0c5e82b45a10015e4bbcb01125.tar.gz gdb-28cc9170c3d0bc0c5e82b45a10015e4bbcb01125.tar.bz2 | |
add casts to avoid arithmetic on void *
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.
bfd/ChangeLog:
2016-04-26 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.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-rx.c | 6 | ||||
| -rw-r--r-- | bfd/mmo.c | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 746adad..8f4de69 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2016-04-26 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. + 2016-04-26 H.J. Lu <hongjiu.lu@intel.com> * elf-bfd.h (elf_link_hash_table): Update comments for 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 ++; @@ -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; } |