From 4e4de10f69d5d705256cadfb15d76314dff16e77 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 8 Nov 2018 10:33:05 -0500
Subject: Throw error if CPubKey is invalid during PSBT keypath serialization

---
 src/script/sign.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/script')

diff --git a/src/script/sign.h b/src/script/sign.h
index d47aada17d..546d14e75c 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -206,6 +206,9 @@ template<typename Stream>
 void SerializeHDKeypaths(Stream& s, const std::map<CPubKey, KeyOriginInfo>& hd_keypaths, uint8_t type)
 {
     for (auto keypath_pair : hd_keypaths) {
+        if (!keypath_pair.first.IsValid()) {
+            throw std::ios_base::failure("Invalid CPubKey being serialized");
+        }
         SerializeToVector(s, type, MakeSpan(keypath_pair.first));
         WriteCompactSize(s, (keypath_pair.second.path.size() + 1) * sizeof(uint32_t));
         s << keypath_pair.second.fingerprint;
-- 
cgit v1.2.3