Exception instead of assigning 0 in case of wrong vector length

This commit is contained in:
Pieter Wuille
2014-04-19 23:25:44 +02:00
parent eb2cbd754d
commit 4d480c8a3f
2 changed files with 15 additions and 10 deletions

View File

@@ -6,6 +6,8 @@
#ifndef BITCOIN_UINT256_H
#define BITCOIN_UINT256_H
#include <assert.h>
#include <stdexcept>
#include <stdint.h>
#include <stdio.h>
#include <string>
@@ -19,6 +21,11 @@ inline signed char HexDigit(char c)
return p_util_hexdigit[(unsigned char)c];
}
class uint_error : public std::runtime_error {
public:
explicit uint_error(const std::string& str) : std::runtime_error(str) {}
};
/** Template base class for unsigned big integers. */
template<unsigned int BITS>
class base_uint
@@ -62,11 +69,9 @@ public:
explicit base_uint(const std::vector<unsigned char>& vch)
{
if (vch.size() == sizeof(pn)) {
memcpy(pn, &vch[0], sizeof(pn));
} else {
*this = 0;
}
if (vch.size() != sizeof(pn))
throw uint_error("Converting vector of wrong size to base_uint");
memcpy(pn, &vch[0], sizeof(pn));
}
bool operator!() const