From 8dc6670ce159c2b080e9f735c6603a601d40b6ac Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Tue, 19 Jul 2022 11:44:04 +0200 Subject: descriptor: don't assert success of extended key derivation It might already fail, and we'll add another failure case. --- src/script/descriptor.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/script/descriptor.cpp') diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index 346a86cad8..9bdffad89b 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -388,14 +388,13 @@ public: } } else { for (auto entry : m_path) { - der = parent_extkey.Derive(parent_extkey, entry); - assert(der); + if (!parent_extkey.Derive(parent_extkey, entry)) return false; } final_extkey = parent_extkey; if (m_derive == DeriveType::UNHARDENED) der = parent_extkey.Derive(final_extkey, pos); assert(m_derive != DeriveType::HARDENED); } - assert(der); + if (!der) return false; final_info_out = final_info_out_tmp; key_out = final_extkey.pubkey; -- cgit v1.2.3