aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2013-02-07 04:43:49 +0000
committerDJ Delorie <dj@redhat.com>2013-02-07 04:43:49 +0000
commit0f5f799a26ee1ab0e591247bb54827a9010bd7b9 (patch)
tree9c41ca427b2994bb6a157e46989764060c5df9bb /libiberty
parent1965d5f2d027f2a389ef64079123fe39ab83a034 (diff)
downloadgdb-0f5f799a26ee1ab0e591247bb54827a9010bd7b9.zip
gdb-0f5f799a26ee1ab0e591247bb54827a9010bd7b9.tar.gz
gdb-0f5f799a26ee1ab0e591247bb54827a9010bd7b9.tar.bz2
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/sha1.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 2a91c41..cbcd1e2 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,6 +1,10 @@
2013-01-31 Kai Tietz <ktietz@redhat.com>
- PR other/543413
+ PR other/54620
+ * sha1.c (sha1_process_block): Handle case that size_t is
+ a wider-integer-scalar as a 32-bit unsigned integer.
+
+ PR other/53413
* md5.c (md5_process_block): Handle case that size_t is
a wider-integer-scalar a 32-bit unsigned integer.
diff --git a/libiberty/sha1.c b/libiberty/sha1.c
index 6a25ab2..617e743 100644
--- a/libiberty/sha1.c
+++ b/libiberty/sha1.c
@@ -300,8 +300,7 @@ sha1_process_block (const void *buffer, size_t len, struct sha1_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);
#define rol(x, n) (((x) << (n)) | ((sha1_uint32) (x) >> (32 - (n))))