diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/darwin.c | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ea5a5708b55..6587b58c618 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2003-10-05 Andrew Pinski <apinski@apple.com> + * config/darwin.c (machopic_non_lazy_ptr_name): Fix off by one + errors in memcpy destinations. + (machopic_stub_name): Likewise. + 2003-10-05 Andrew Pinski <apinski@apple.com> * config/darwin.c (machopic_non_lazy_ptr_name): diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 85c00ba2523..6688bbe32b6 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -304,17 +304,17 @@ machopic_non_lazy_ptr_name (const char *name) bufferlen = 2; if (name[0] == '*') { - memcpy (buffer+bufferlen, name+1, namelen-1+1); + memcpy (buffer + bufferlen +1, name+1, namelen-1+1); bufferlen += namelen-1; } else { buffer[bufferlen] = '_'; - memcpy (buffer+bufferlen+1, name, namelen+1); + memcpy (buffer + bufferlen+1 +1, name, namelen+1); bufferlen += namelen; } - memcpy (buffer + bufferlen, "$non_lazy_ptr", strlen("$non_lazy_ptr")+1); + memcpy (buffer + bufferlen +1, "$non_lazy_ptr", strlen("$non_lazy_ptr")+1); bufferlen += strlen("$non_lazy_ptr"); ptr_name = get_identifier (buffer); @@ -379,24 +379,24 @@ machopic_stub_name (const char *name) if (name[0] == '*') { - memcpy (buffer + bufferlen, name+1, namelen - 1 +1); + memcpy (buffer + bufferlen +1, name+1, namelen - 1 +1); bufferlen += namelen - 1; } else { buffer[bufferlen] = '_'; - memcpy (buffer + bufferlen +1, name, namelen+1); + memcpy (buffer + bufferlen+1 +1, name, namelen+1); bufferlen += namelen; } if (needs_quotes) { - memcpy (buffer + bufferlen, "$stub\"", strlen("$stub\"")); + memcpy (buffer + bufferlen +1, "$stub\"", strlen("$stub\"")); bufferlen += strlen("$stub\""); } else { - memcpy (buffer + bufferlen, "$stub", strlen("$stub")); + memcpy (buffer + bufferlen +1, "$stub", strlen("$stub")); bufferlen += strlen("$stub"); } ptr_name = get_identifier (buffer); |