From ba9ff424c2d37716c46cf2c0bd1130538bdf2c8f Mon Sep 17 00:00:00 2001
From: Felipe Lima <felipe.lima@gmail.com>
Date: Tue, 26 Aug 2014 10:56:17 -0300
Subject: [PATCH 1/3] Fixes unhandled exceptions in Transaction

---
 lib/Transaction.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/Transaction.js b/lib/Transaction.js
index bb53fa4..f023b54 100644
--- a/lib/Transaction.js
+++ b/lib/Transaction.js
@@ -633,8 +633,13 @@ Transaction.prototype.getReceivingAddresses = function(networkName) {
   ret = [];
   for (var i = 0; i<this.outs.length; i++) {
     var o = this.outs[i];
-    var addr = Address.fromScriptPubKey(o.getScript(), networkName)[0].toString();
-    ret.push(addr);
+    var tmp = Address.fromScriptPubKey(o.getScript(), networkName);
+    if (typeof tmp !== 'undefined') {
+      var addr = tmp[0].toString();
+      ret.push(addr);
+    } else {
+      ret.push(null);
+    }
   }
   return ret;
 };
@@ -648,8 +653,13 @@ Transaction.prototype.getSendingAddresses = function(networkName) {
       ret.push(null);
       continue;
     }
-    var addr = Address.fromScriptSig(scriptSig, networkName);
-    ret.push(addr?addr.toString():null);
+    try {
+      var addr = Address.fromScriptSig(scriptSig, networkName);
+      ret.push(addr?addr.toString():null);
+    } catch(err) {
+      // Error: Invalid public key
+      ret.push(null);
+    }
   }
   return ret;
 };

From 693f2aac7b5644b1b448f1c11b4e02d6f750ca94 Mon Sep 17 00:00:00 2001
From: Felipe Lima <felipe.lima@gmail.com>
Date: Tue, 26 Aug 2014 11:25:50 -0300
Subject: [PATCH 2/3] Fixes undefined check

---
 lib/Transaction.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Transaction.js b/lib/Transaction.js
index f023b54..49425bf 100644
--- a/lib/Transaction.js
+++ b/lib/Transaction.js
@@ -634,7 +634,7 @@ Transaction.prototype.getReceivingAddresses = function(networkName) {
   for (var i = 0; i<this.outs.length; i++) {
     var o = this.outs[i];
     var tmp = Address.fromScriptPubKey(o.getScript(), networkName);
-    if (typeof tmp !== 'undefined') {
+    if (typeof tmp[0] !== 'undefined') {
       var addr = tmp[0].toString();
       ret.push(addr);
     } else {

From c9c49da65823fe3bc25f0dc7f5d3c7541414d95f Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Wed, 1 Oct 2014 13:31:32 -0300
Subject: [PATCH 3/3] refactor changes

---
 lib/Address.js     |  8 +++++++-
 lib/Transaction.js | 19 +++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/Address.js b/lib/Address.js
index 8404b38..becf643 100644
--- a/lib/Address.js
+++ b/lib/Address.js
@@ -189,7 +189,13 @@ Address.fromPubkeyHashScriptSig = function(scriptSig, network) {
 //extract an address from scriptSig
 Address.fromScriptSig = function(scriptSig, network) {
   if (typeof scriptSig === 'string') {
-    scriptSig = new Script(new Buffer(scriptSig, 'hex'));
+    try {
+      var scriptSigBuf = new Buffer(scriptSig, 'hex')
+    } catch(err) {
+      // Error: Invalid public key
+      return null;
+    }
+    scriptSig = new Script(scriptSigBuf);
   }
   if (!network)
     network = 'livenet';
diff --git a/lib/Transaction.js b/lib/Transaction.js
index 49425bf..149acf8 100644
--- a/lib/Transaction.js
+++ b/lib/Transaction.js
@@ -633,19 +633,19 @@ Transaction.prototype.getReceivingAddresses = function(networkName) {
   ret = [];
   for (var i = 0; i<this.outs.length; i++) {
     var o = this.outs[i];
-    var tmp = Address.fromScriptPubKey(o.getScript(), networkName);
-    if (typeof tmp[0] !== 'undefined') {
-      var addr = tmp[0].toString();
-      ret.push(addr);
+    var addrs = Address.fromScriptPubKey(o.getScript(), networkName);
+    if (typeof addrs[0] !== 'undefined') {
+      ret.push(addrs[0].toString());
     } else {
       ret.push(null);
     }
   }
   return ret;
 };
+
 Transaction.prototype.getSendingAddresses = function(networkName) {
-  var ret = [];
   if (!networkName) networkName = 'livenet';
+  var ret = [];
   for (var i = 0; i<this.ins.length; i++) {
     var input = this.ins[i];
     var scriptSig = input.getScript();
@@ -653,13 +653,8 @@ Transaction.prototype.getSendingAddresses = function(networkName) {
       ret.push(null);
       continue;
     }
-    try {
-      var addr = Address.fromScriptSig(scriptSig, networkName);
-      ret.push(addr?addr.toString():null);
-    } catch(err) {
-      // Error: Invalid public key
-      ret.push(null);
-    }
+    var addr = Address.fromScriptSig(scriptSig, networkName);
+    ret.push(addr?addr.toString():null);
   }
   return ret;
 };