Skip to content

Commit 5940c53

Browse files
committed
Issue #26798: Coverity complains about potential memcpy() of overlapped regions. It doesn't hurt to use memmove() here. CID 1372514 / CID 1372515. Upstream BLAKE2/BLAKE2#32
1 parent cf45ee1 commit 5940c53

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Modules/_blake2/impl/blake2b-ref.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen )
334334
blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
335335
blake2b_compress( S, S->buf );
336336
S->buflen -= BLAKE2B_BLOCKBYTES;
337-
memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen );
337+
memmove( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen );
338338
}
339339

340340
blake2b_increment_counter( S, S->buflen );

Modules/_blake2/impl/blake2b.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen )
371371
blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
372372
blake2b_compress( S, S->buf );
373373
S->buflen -= BLAKE2B_BLOCKBYTES;
374-
memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen );
374+
memmove( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen );
375375
}
376376

377377
blake2b_increment_counter( S, S->buflen );

Modules/_blake2/impl/blake2s-ref.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen )
325325
blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES );
326326
blake2s_compress( S, S->buf );
327327
S->buflen -= BLAKE2S_BLOCKBYTES;
328-
memcpy( S->buf, S->buf + BLAKE2S_BLOCKBYTES, S->buflen );
328+
memmove( S->buf, S->buf + BLAKE2S_BLOCKBYTES, S->buflen );
329329
}
330330

331331
blake2s_increment_counter( S, ( uint32_t )S->buflen );

Modules/_blake2/impl/blake2s.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen )
348348
blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES );
349349
blake2s_compress( S, S->buf );
350350
S->buflen -= BLAKE2S_BLOCKBYTES;
351-
memcpy( S->buf, S->buf + BLAKE2S_BLOCKBYTES, S->buflen );
351+
memmove( S->buf, S->buf + BLAKE2S_BLOCKBYTES, S->buflen );
352352
}
353353

354354
blake2s_increment_counter( S, ( uint32_t )S->buflen );

0 commit comments

Comments
 (0)