Properly account for Address.fromOutputScript raising an exception wh…

…en it can't decode a script
darkwallet · Oct 17, 2014 · 379ba59 · 379ba59
1 parent 5eb34b8
commit 379ba59
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/js/model/history.js b/js/model/history.js
@@ -171,10 +171,14 @@ History.prototype.getTransferLabel = function(pocketImpact) {
  * @private
  */
 History.prototype.fillInput = function(transaction, data) {
-    var index = data[0],
+    var address,
+        index = data[0],
         newRow = data[1],
         txObj = Bitcoin.Transaction.fromHex(transaction);
-    var address = Bitcoin.Address.fromOutputScript(txObj.outs[index].script, Bitcoin.networks[this.identity.wallet.network]);
+    try {
+        address = Bitcoin.Address.fromOutputScript(txObj.outs[index].script, Bitcoin.networks[this.identity.wallet.network]);
+    } catch(e) {
+    }
     if (address) {
         newRow.address = address.toString();
         this.update();

diff --git a/js/model/tx.js b/js/model/tx.js
@@ -324,6 +324,11 @@ Transaction.prototype.process = function(serializedTx, height) {
 
     // Now parse inputs and outputs
     tx.outs.forEach(function(txOut, i){
+      var outType = Bitcoin.scripts.classifyOutput(txOut.script, Bitcoin.networks[wallet.versions.network]);
+      // don't process output if not of the right type or has no value
+      if (!outType || outType === 'nulldata' || !txOut.value) {
+          return;
+      }
       var address = Bitcoin.Address.fromOutputScript(txOut.script, Bitcoin.networks[wallet.versions.network]).toString();
       var outputAddress = wallet.getWalletAddress(address);
       // already exists