Merge pull request #84 from justinabrahms/invalid-json

Error if invalid json is passed.

Author: nscuro

decode.go

@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"encoding/xml"
 	"io"
+	"io/ioutil"
 )
 
 type BOMDecoder interface {
@@ -40,7 +41,11 @@ type jsonBOMDecoder struct {
 
 // Decode implements the BOMDecoder interface.
 func (j jsonBOMDecoder) Decode(bom *BOM) error {
-	return json.NewDecoder(j.reader).Decode(bom)
+	bytes, err := ioutil.ReadAll(j.reader)
+	if err != nil {
+		return err
+	}
+	return json.Unmarshal(bytes, bom)
 }
 
 type xmlBOMDecoder struct {

decode_test.go

@@ -30,6 +30,18 @@ func TestNewBOMDecoder(t *testing.T) {
 	assert.IsType(t, &xmlBOMDecoder{}, NewBOMDecoder(nil, BOMFileFormatXML))
 }
 
+func TestXmlBOMDecoder_Decode_InvalidXML(t *testing.T) {
+	var bom BOM
+	err := NewBOMDecoder(strings.NewReader("invalid"), BOMFileFormatXML).Decode(&bom)
+	require.Error(t, err)
+}
+
+func TestJsonBOMDecoder_Decode_InvalidJson(t *testing.T) {
+	var bom BOM
+	err := NewBOMDecoder(strings.NewReader("{}invalid"), BOMFileFormatJSON).Decode(&bom)
+	require.Error(t, err)
+}
+
 func TestXmlBOMDecoder_Decode(t *testing.T) {
 	t.Run("ShouldSetSpecVersion", func(t *testing.T) {
 		testCases := []struct {