Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Re: [PATCH 2/3] sha1: clean pointer arithmetic

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:54:44

Yann Droneaud [off-list ref] writes:
One memcpy() argument is computed from a pointer added to an integer:
eg. int + pointer. It's unusal.
Let's write it in the correct order: pointer + offset.
Meh.

Both are correct.  Aren't ctx->w[lenW] and lenW[ctx-w] both correct,
even?

quoted hunk
Signed-off-by: Yann Droneaud <redacted>
---
 block-sha1/sha1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
index c1af112..a7c4470 100644
--- a/block-sha1/sha1.c
+++ b/block-sha1/sha1.c
@@ -246,7 +246,7 @@ void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len)
 		unsigned int left = 64 - lenW;
 		if (len < left)
 			left = len;
-		memcpy(lenW + (char *)ctx->W, data, left);
+		memcpy((char *)ctx->W + lenW, data, left);
 		lenW = (lenW + left) & 63;
 		if (lenW)
 			return;
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help