Merge pull request #79 from openziti/avoid.nil.ref.pem.decode

nil check on PEM decode
openziti · Jun 10, 2020 · bd73d96 · bd73d96
2 parents 9e814e0 + 6c7a8c4
commit bd73d96
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/identity/certtools/certificates.go b/identity/certtools/certificates.go
@@ -19,15 +19,21 @@ package certtools
 import (
 	"crypto/x509"
 	"encoding/pem"
+	"errors"
 	"fmt"
 	"io/ioutil"
 )
 
 func LoadCert(pemBytes []byte) ([]*x509.Certificate, error) {
-	certs := make ([]*x509.Certificate, 0)
+	certs := make([]*x509.Certificate, 0)
 	var keyBlock *pem.Block
 	for len(pemBytes) > 0 {
 		keyBlock, pemBytes = pem.Decode(pemBytes)
+
+		if keyBlock == nil {
+			return nil, errors.New("could not parse")
+		}
+
 		switch keyBlock.Type {
 		case "CERTIFICATE":
 			if c, err := x509.ParseCertificate(keyBlock.Bytes); err == nil {

diff --git a/storage/boltz/typed_bucket.go b/storage/boltz/typed_bucket.go
@@ -709,6 +709,7 @@ func (bucket *TypedBucket) setMarshaled(name string, value interface{}) *TypedBu
 		bucket.SetNil(name)
 		return bucket
 	}
+
 	switch val := value.(type) {
 	case string:
 		bucket.SetString(name, val, nil)