com php-src: ext/sodium: Avoid shifts wider than 32 bits on size_t values: ext/sodium/libsodium.c
| From: | Frank Denis | Date: | Sun, 14 Oct 2018 08:21:29 +0000 |
| Subject: | com php-src: ext/sodium: Avoid shifts wider than 32 bits on size_t values: ext/sodium/libsodium.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103459@lists.php.net to get a copy of this message | ||
Commit: d05745816634d82a14bb8abb9c322c8b63be098f
Author: Frank Denis <github@pureftpd.org> Sun, 14 Oct 2018 10:21:29 +0200
Parents: c25b1a7e8cc1757cc633a74dac31ac4f951757d8
Branches: PHP-7.2
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d05745816634d82a14bb8abb9c322c8b63be098f
Log:
ext/sodium: Avoid shifts wider than 32 bits on size_t values
Backport from PECL libsodium-php 2.0.10
Changed paths:
M ext/sodium/libsodium.c
Diff:
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
index e168aad..08ac0f9 100644
--- a/ext/sodium/libsodium.c
+++ b/ext/sodium/libsodium.c
@@ -3405,7 +3405,8 @@ PHP_FUNCTION(sodium_pad)
for (j = 0U; j <= xpadded_len; j++) {
ZSTR_VAL(padded)[j] = unpadded[i];
k -= st;
- st = (~(((((k >> 48) | (k >> 32) | (k >> 16) | k) & 0xffff) - 1U) >>
16)) & 1U;
+ st = (size_t) (~(((( (((uint64_t) k) >> 48) | (((uint64_t) k) >> 32) |
+ (k >> 16) | k) & 0xffff) - 1U) >> 16)) & 1U;
i += st;
}
#if SODIUM_LIBRARY_VERSION_MAJOR > 9 || (SODIUM_LIBRARY_VERSION_MAJOR == 9 &&
SODIUM_LIBRARY_VERSION_MINOR >= 6)