changeset:   103305:fa89fff0b52c
user:        Christian Heimes <christian@python.org>
date:        Thu Sep 08 13:40:25 2016 +0200
files:       Modules/_blake2/impl/blake2b-ref.c Modules/_blake2/impl/blake2b.c Modules/_blake2/impl/blake2s-ref.c Modules/_blake2/impl/blake2s.c
description:
Issue #26798: Coverity complains about potential memcpy() of overlapped regions. It doesn't hurt to use memmove() here. CID 1372514 / CID 1372515. Upstream https://github.com/BLAKE2/BLAKE2/issues/32


diff -r e5871ffe9ac0 -r fa89fff0b52c Modules/_blake2/impl/blake2b-ref.c
--- a/Modules/_blake2/impl/blake2b-ref.c	Thu Sep 08 13:35:00 2016 +0200
+++ b/Modules/_blake2/impl/blake2b-ref.c	Thu Sep 08 13:40:25 2016 +0200
@@ -334,7 +334,7 @@
     blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
     blake2b_compress( S, S->buf );
     S->buflen -= BLAKE2B_BLOCKBYTES;
-    memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen );
+    memmove( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen );
   }
 
   blake2b_increment_counter( S, S->buflen );
diff -r e5871ffe9ac0 -r fa89fff0b52c Modules/_blake2/impl/blake2b.c
--- a/Modules/_blake2/impl/blake2b.c	Thu Sep 08 13:35:00 2016 +0200
+++ b/Modules/_blake2/impl/blake2b.c	Thu Sep 08 13:40:25 2016 +0200
@@ -371,7 +371,7 @@
     blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
     blake2b_compress( S, S->buf );
     S->buflen -= BLAKE2B_BLOCKBYTES;
-    memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen );
+    memmove( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen );
   }
 
   blake2b_increment_counter( S, S->buflen );
diff -r e5871ffe9ac0 -r fa89fff0b52c Modules/_blake2/impl/blake2s-ref.c
--- a/Modules/_blake2/impl/blake2s-ref.c	Thu Sep 08 13:35:00 2016 +0200
+++ b/Modules/_blake2/impl/blake2s-ref.c	Thu Sep 08 13:40:25 2016 +0200
@@ -325,7 +325,7 @@
     blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES );
     blake2s_compress( S, S->buf );
     S->buflen -= BLAKE2S_BLOCKBYTES;
-    memcpy( S->buf, S->buf + BLAKE2S_BLOCKBYTES, S->buflen );
+    memmove( S->buf, S->buf + BLAKE2S_BLOCKBYTES, S->buflen );
   }
 
   blake2s_increment_counter( S, ( uint32_t )S->buflen );
diff -r e5871ffe9ac0 -r fa89fff0b52c Modules/_blake2/impl/blake2s.c
--- a/Modules/_blake2/impl/blake2s.c	Thu Sep 08 13:35:00 2016 +0200
+++ b/Modules/_blake2/impl/blake2s.c	Thu Sep 08 13:40:25 2016 +0200
@@ -348,7 +348,7 @@
     blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES );
     blake2s_compress( S, S->buf );
     S->buflen -= BLAKE2S_BLOCKBYTES;
-    memcpy( S->buf, S->buf + BLAKE2S_BLOCKBYTES, S->buflen );
+    memmove( S->buf, S->buf + BLAKE2S_BLOCKBYTES, S->buflen );
   }
 
   blake2s_increment_counter( S, ( uint32_t )S->buflen );