aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2008-03-11 16:11:55 +0000
committerDJ Delorie <dj@redhat.com>2008-03-11 16:11:55 +0000
commit3f69c6bf14b5cb5a37825d65ccc08cd9201c5ddf (patch)
tree7cefc3bb859fdae1ab8c376d2fd5e4d94cc39424
parent5f5fb9ec64b9498a205202e2668f15b03be646b4 (diff)
downloadgdb-3f69c6bf14b5cb5a37825d65ccc08cd9201c5ddf.zip
gdb-3f69c6bf14b5cb5a37825d65ccc08cd9201c5ddf.tar.gz
gdb-3f69c6bf14b5cb5a37825d65ccc08cd9201c5ddf.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/md5.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 0153ff7..baa4bda 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-11 Nick Clifton <nickc@redhat.com>
+
+ * md5.c (md5_process_bytes): Do not assume that memcpy will
+ provide a return value.
+
2008-02-19 Ben Elliston <bje@au.ibm.com>
PR other/12618
diff --git a/libiberty/md5.c b/libiberty/md5.c
index 83e0beb..9de9d88 100644
--- a/libiberty/md5.c
+++ b/libiberty/md5.c
@@ -234,7 +234,8 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
if (UNALIGNED_P (buffer))
while (len > 64)
{
- md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+ memcpy (ctx->buffer, buffer, 64);
+ md5_process_block (ctx->buffer, 64, ctx);
buffer = (const char *) buffer + 64;
len -= 64;
}