From fa43e7c2d9dc5e2df70acd2019bdd24023c1d333 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 8 Oct 2021 15:51:55 +0200 Subject: bitcoin-tx: Avoid treating overflow as OP_0 --- src/core_read.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core_read.cpp') diff --git a/src/core_read.cpp b/src/core_read.cpp index 3bbecbf52b..2149b428d2 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -66,16 +66,16 @@ CScript ParseScript(const std::string& s) (w.front() == '-' && w.size() > 1 && std::all_of(w.begin() + 1, w.end(), ::IsDigit))) { // Number - int64_t n = LocaleIndependentAtoi(w); + const auto num{ToIntegral(w)}; // limit the range of numbers ParseScript accepts in decimal // since numbers outside -0xFFFFFFFF...0xFFFFFFFF are illegal in scripts - if (n > int64_t{0xffffffff} || n < -1 * int64_t{0xffffffff}) { + if (!num.has_value() || num > int64_t{0xffffffff} || num < -1 * int64_t{0xffffffff}) { throw std::runtime_error("script parse error: decimal numeric value only allowed in the " "range -0xFFFFFFFF...0xFFFFFFFF"); } - result << n; + result << num.value(); } else if (w.substr(0, 2) == "0x" && w.size() > 2 && IsHex(std::string(w.begin() + 2, w.end()))) { // Raw hex data, inserted NOT pushed onto stack: std::vector raw = ParseHex(std::string(w.begin() + 2, w.end())); -- cgit v1.2.3