aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-08-03 17:09:12 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-08-03 17:09:23 +0200
commit6278bd57c662e29b07df9db50c47095c0bb44a82 (patch)
treed4ea52a544bebd678f5edd06e18f93bf1e7a89dc /src
parentb4c61f878cf2dc91d7f2db96718d362a57d37739 (diff)
parent6fd59ee897e9dc9b021440cbb738186dbf3a3e98 (diff)
downloadbitcoin-6278bd57c662e29b07df9db50c47095c0bb44a82.tar.xz
Merge pull request #4602
6fd59ee script.h: set_vch() should shift a >32 bit value (Jeff Garzik)
Diffstat (limited to 'src')
-rw-r--r--src/script.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script.h b/src/script.h
index ea944b4996..7cb863d1c9 100644
--- a/src/script.h
+++ b/src/script.h
@@ -166,7 +166,7 @@ private:
// If the input vector's most significant byte is 0x80, remove it from
// the result's msb and return a negative.
if (vch.back() & 0x80)
- return -(result & ~(0x80 << (8 * (vch.size() - 1))));
+ return -(result & ~(0x80ULL << (8 * (vch.size() - 1))));
return result;
}