mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 02:25:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge #10530: Fix invalid instantiation and possibly unsafe accesses of array in class base_uint<BITS>

Browse Source 
e5c6168 Fix instantiation and array accesses in class base_uint<BITS> (Pavlos Antoniou)

Tree-SHA512: e4d39510d776c5ae8814cd5fb5c5d183cd8da937e339bff95caff68a84492fbec68bf513c5a6267446a564d39093e0c7fc703c645b511caab80f7baf7955b804
This commit is contained in:
Wladimir J. van der Laan 2017-06-22 17:10:16 +02:00
commit 87e69c2549
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arith_uint256.cpp
View File

@ -15,6 +15,8 @@
template <unsigned int BITS>
base_uint<BITS>::base_uint(const std::string& str)
{
static_assert(BITS/32 > 0 && BITS%32 == 0, "Template parameter BITS must be a positive multiple of 32.");
SetHex(str);
}

10
src/arith_uint256.h
View File

@ -31,12 +31,16 @@ public:
base_uint()
{
static_assert(BITS/32 > 0 && BITS%32 == 0, "Template parameter BITS must be a positive multiple of 32.");
for (int i = 0; i < WIDTH; i++)
pn[i] = 0;
}
base_uint(const base_uint& b)
{
static_assert(BITS/32 > 0 && BITS%32 == 0, "Template parameter BITS must be a positive multiple of 32.");
for (int i = 0; i < WIDTH; i++)
pn[i] = b.pn[i];
}
@ -50,6 +54,8 @@ public:
base_uint(uint64_t b)
{
static_assert(BITS/32 > 0 && BITS%32 == 0, "Template parameter BITS must be a positive multiple of 32.");
pn[0] = (unsigned int)b;
pn[1] = (unsigned int)(b >> 32);
for (int i = 2; i < WIDTH; i++)
@ -174,7 +180,7 @@ public:
{
// prefix operator
int i = 0;
while (++pn[i] == 0 && i < WIDTH-1)
while (i < WIDTH && ++pn[i] == 0)
i++;
return *this;
}
@ -191,7 +197,7 @@ public:
{
// prefix operator
int i = 0;
while (--pn[i] == (uint32_t)-1 && i < WIDTH-1)
while (i < WIDTH && --pn[i] == (uint32_t)-1)
i++;
return *this;
}