From: DJ Delorie <dj@redhat.com>
Date: Tue, 11 Mar 2008 16:11:55 +0000 (+0000)
Subject: merge from gcc
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=3f69c6bf14b5cb5a37825d65ccc08cd9201c5ddf;p=deliverable%2Fbinutils-gdb.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 0153ff7e17..baa4bdabe2 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 83e0beb339..9de9d88c22 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;
           }