Merged from trunk.

PR other/543413
	* md5.c (md5_process_block):  Handle case that size_t is
	a wider-integer-scalar a 32-bit unsigned integer.

From-SVN: r195602
This commit is contained in:
Kai Tietz 2013-01-31 09:15:57 +01:00 committed by Kai Tietz
parent 1640f704a1
commit 27071671e0
2 changed files with 7 additions and 2 deletions

View File

@ -1,4 +1,10 @@
2013-01-31 Kai Tietz <ktietz@redhat.com>
Merged from trunk.
PR other/543413
* md5.c (md5_process_block): Handle case that size_t is
a wider-integer-scalar a 32-bit unsigned integer.
2012-07-31 Mike Frysinger <vapier@gentoo.org>
Merged from trunk.

View File

@ -293,8 +293,7 @@ md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
length of the file up to 2^64 bits. Here we only compute the
number of bytes. Do a double word increment. */
ctx->total[0] += len;
if (ctx->total[0] < len)
++ctx->total[1];
ctx->total[1] += ((len >> 31) >> 1) + (ctx->total[0] < len);
/* Process all bytes in the buffer with 64 bytes in each round of
the loop. */