Root key validity is checked before deriving

1 files changed, 8 insertions, 0 deletions

diff --git a/bip39-standalone.html b/bip39-standalone.html
index 367d9a2..ca18ea8 100644
--- a/bip39-standalone.html
+++ b/bip39-standalone.html
@@ -18964,6 +18964,10 @@ window.Entropy = new (function() {
     }
 
     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("/");
@@ -19098,6 +19102,10 @@ window.Entropy = new (function() {
                 }
             }
         }
+        // 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);