From 0a1f0259d1cfe5217ca9c08f7fbd371a03703594 Mon Sep 17 00:00:00 2001
From: Ian Coleman <coleman.ian@gmail.com>
Date: Mon, 19 Dec 2016 14:16:49 +1100
Subject: Root key validity is checked before deriving

---
 src/js/index.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/js/index.js b/src/js/index.js
index 45edea8..13c6178 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -324,6 +324,10 @@
     }
 
     function calcBip32ExtendedKey(path) {
+        // Check there's a root key to derive from
+        if (!bip32RootKey) {
+            return bip32RootKey;
+        }
         var extendedKey = bip32RootKey;
         // Derive the key from the path
         var pathBits = path.split("/");
@@ -458,6 +462,10 @@
                 }
             }
         }
+        // Check root key exists or else derivation path is useless!
+        if (!bip32RootKey) {
+            return "No root key";
+        }
         // Check no hardened derivation path when using xpub keys
         var hardened = path.indexOf("'") > -1;
         var isXpubkey = !("privKey" in bip32RootKey);
-- 
cgit v1.2.3