From cf2b013bb6974353893a9febcbdb6c76377bed0a Mon Sep 17 00:00:00 2001
From: Dan Janosik <janoside@gmail.com>
Date: Sat, 12 May 2018 23:09:58 -0400
Subject: [PATCH] safer address parsing

---
 routes/baseActionsRouter.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/routes/baseActionsRouter.js b/routes/baseActionsRouter.js
index ea191e0..e364a20 100644
--- a/routes/baseActionsRouter.js
+++ b/routes/baseActionsRouter.js
@@ -433,11 +433,18 @@ router.get("/address/:address", function(req, res) {
 	
 	res.locals.result = {};
 
-	if (address.startsWith("1") || address.startsWith("3")) {
+	try {
 		res.locals.addressObj = bitcoinjs.address.fromBase58Check(address);
 
-	} else {
-		res.locals.addressObj = bitcoinjs.address.fromBech32(address);
+	} catch (err) {
+		console.log("Error u3gr02gwef: " + err);
+
+		try {
+			res.locals.addressObj = bitcoinjs.address.fromBech32(address);
+
+		} catch (err2) {
+			console.log("Error u02qg02yqge: " + err2);
+		}
 	}
 	
 	rpcApi.getAddress(address).then(function(result) {