From 2a475d729999ff71607acd07d97b906175e2285c Mon Sep 17 00:00:00 2001
From: "John C. Vernaleo" <jcv@conformal.com>
Date: Fri, 14 Jun 2013 11:47:09 -0400
Subject: [PATCH] Need to test for nil before regex.
---
jsonfxns.go | 10 ++++++----
test_coverage.txt | 4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/jsonfxns.go b/jsonfxns.go
index 7726cdb9..a703acd5 100644
--- a/jsonfxns.go
+++ b/jsonfxns.go
@@ -35,10 +35,12 @@ func MarshallAndSend(rawReply Reply, w io.Writer) (string, error) {
func jsonRpcSend(user string, password string, server string, message []byte) (*http.Response, error) {
resp, err := http.Post("http://"+user+":"+password+"@"+server,
"application/json", bytes.NewBuffer(message))
- // We do not want to log the username/password in the errors.
- re := regexp.MustCompile(`http://\w+:\w+`)
- errString := re.ReplaceAllString(fmt.Sprintf("%v", err), "")
- err = fmt.Errorf(errString)
+ if err != nil {
+ // We do not want to log the username/password in the errors.
+ re := regexp.MustCompile(`http://\w+:\w+`)
+ errString := re.ReplaceAllString(fmt.Sprintf("%v", err), "")
+ err = fmt.Errorf(errString)
+ }
return resp, err
}
diff --git a/test_coverage.txt b/test_coverage.txt
index f0e3d661..863b0e8d 100644
--- a/test_coverage.txt
+++ b/test_coverage.txt
@@ -2,10 +2,10 @@
github.com/conformal/btcjson/jsonapi.go CreateMessage 100.00% (310/310)
github.com/conformal/btcjson/jsonfxns.go MarshallAndSend 100.00% (7/7)
github.com/conformal/btcjson/jsonfxns.go GetRaw 100.00% (6/6)
+github.com/conformal/btcjson/jsonfxns.go jsonRpcSend 100.00% (6/6)
github.com/conformal/btcjson/jsonapi.go jsonWithArgs 100.00% (5/5)
-github.com/conformal/btcjson/jsonfxns.go jsonRpcSend 100.00% (5/5)
github.com/conformal/btcjson/jsonapi.go IsValidIdType 100.00% (3/3)
github.com/conformal/btcjson/jsonapi.go RpcCommand 66.67% (18/27)
github.com/conformal/btcjson/jsonapi.go readResultCmd 40.00% (20/50)
-github.com/conformal/btcjson --------------- 90.56% (374/413)
+github.com/conformal/btcjson --------------- 90.58% (375/414)