Fix NPE in gossip integration.go, load tls certificate

C0rWin · C0rWin · commit 6c146d10855f · 2017-03-09T21:26:58.000+02:00
Currently while gossip loads tls certificate there is a null pointer
dereference, this commit takes care to load certificate correctly.

Change-Id: I28833382770053deaac44578ca8abd1abb464ff2
Signed-off-by: Artem Barger &lt;bartem@il.ibm.com&gt;
diff --git a/gossip/integration/integration.go b/gossip/integration/integration.go
@@ -40,10 +40,11 @@ func newConfig(selfEndpoint string, externalEndpoint string, bootPeers ...string
 
 	var cert *tls.Certificate
 	if viper.GetBool("peer.tls.enabled") {
-		*cert, err = tls.LoadX509KeyPair(viper.GetString("peer.tls.cert.file"), viper.GetString("peer.tls.key.file"))
+		certTmp, err := tls.LoadX509KeyPair(viper.GetString("peer.tls.cert.file"), viper.GetString("peer.tls.key.file"))
 		if err != nil {
 			panic(err)
 		}
+		cert = &certTmp
 	}
 
 	return &gossip.Config{

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,11 @@ func newConfig(selfEndpoint string, externalEndpoint string, bootPeers ...string`
`40`	`40`
`41`	`41`	`var cert *tls.Certificate`
`42`	`42`	`if viper.GetBool("peer.tls.enabled") {`
`43`		`- *cert, err = tls.LoadX509KeyPair(viper.GetString("peer.tls.cert.file"), viper.GetString("peer.tls.key.file"))`
	`43`	`+ certTmp, err := tls.LoadX509KeyPair(viper.GetString("peer.tls.cert.file"), viper.GetString("peer.tls.key.file"))`
`44`	`44`	`if err != nil {`
`45`	`45`	`panic(err)`
`46`	`46`	`}`
	`47`	`+ cert = &certTmp`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`return &gossip.Config{`