From 1b33e8258e07ea1da9064b06ee29a0d0831b693d Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sat, 20 Jul 2019 00:10:42 +0200
Subject: [PATCH] Add error handling

Added error handling around ineffectual err assignments. Please review
thoroughly.
---
 viper.go      | 3 +++
 viper_test.go | 1 +
 2 files changed, 4 insertions(+)

diff --git a/viper.go b/viper.go
index 07ef850..712c5e3 100644
--- a/viper.go
+++ b/viper.go
@@ -1469,6 +1469,9 @@ func (v *Viper) marshalWriter(f afero.File, configType string) error {
 
 	case "hcl":
 		b, err := json.Marshal(c)
+		if err != nil {
+			return ConfigMarshalError{err}
+		}
 		ast, err := hcl.Parse(string(b))
 		if err != nil {
 			return ConfigMarshalError{err}
diff --git a/viper_test.go b/viper_test.go
index f91791f..c1ea262 100644
--- a/viper_test.go
+++ b/viper_test.go
@@ -952,6 +952,7 @@ func TestDirsSearch(t *testing.T) {
 	v.SetDefault(`key`, `default`)
 
 	entries, err := ioutil.ReadDir(root)
+	assert.Nil(t, err)
 	for _, e := range entries {
 		if e.IsDir() {
 			v.AddConfigPath(e.Name())