From cf40a2dfafbb9f0dc1b9911fe1bd88f5e0af92d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Landabaso=20D=C3=ADaz?= Date: Mon, 23 Jan 2023 22:45:36 +0100 Subject: [PATCH 1/3] Fixes #126 --- compiler.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler.cpp b/compiler.cpp index d0b6de3..be7c5b1 100644 --- a/compiler.cpp +++ b/compiler.cpp @@ -846,10 +846,12 @@ std::string Disassembler(CScript::const_iterator& it, CScript::const_iterator en } if (data.size() == 20) { if (data == std::vector(20, 0x99)) { - ret += ""; + ret += ""; } else if (data[0] == 'P' && data[1] == 'K' && data[2] == 'h') { while (data.size() && data.back() == 0) data.pop_back(); ret += ""; + } else { + ret += "<" + HexStr(data.begin(), data.end()) + ">"; } } else if (data.size() == 32 && data == std::vector(32, 0x88)) { ret += ""; From e9cb8c07bf1412c7e8f44d41c895cd26e1b38465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Landabaso=20D=C3=ADaz?= Date: Mon, 23 Jan 2023 23:00:18 +0100 Subject: [PATCH 2/3] Add extra check on data size --- compiler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler.cpp b/compiler.cpp index be7c5b1..395b59d 100644 --- a/compiler.cpp +++ b/compiler.cpp @@ -850,7 +850,7 @@ std::string Disassembler(CScript::const_iterator& it, CScript::const_iterator en } else if (data[0] == 'P' && data[1] == 'K' && data[2] == 'h') { while (data.size() && data.back() == 0) data.pop_back(); ret += ""; - } else { + } else if (data.size() > 0) { ret += "<" + HexStr(data.begin(), data.end()) + ">"; } } else if (data.size() == 32 && data == std::vector(32, 0x88)) { From 88e3dcc22640510e5a9fc833002c94dfe7c5b8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Landabaso=20D=C3=ADaz?= Date: Tue, 24 Jan 2023 07:14:28 +0100 Subject: [PATCH 3/3] Remove redundant extra check on data size This reverts commit e9cb8c07bf1412c7e8f44d41c895cd26e1b38465. --- compiler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler.cpp b/compiler.cpp index 395b59d..be7c5b1 100644 --- a/compiler.cpp +++ b/compiler.cpp @@ -850,7 +850,7 @@ std::string Disassembler(CScript::const_iterator& it, CScript::const_iterator en } else if (data[0] == 'P' && data[1] == 'K' && data[2] == 'h') { while (data.size() && data.back() == 0) data.pop_back(); ret += ""; - } else if (data.size() > 0) { + } else { ret += "<" + HexStr(data.begin(), data.end()) + ">"; } } else if (data.size() == 32 && data == std::vector(32, 0x88)) {