From 57c50704dfc305b1b3bf736dfb08d04366dde636 Mon Sep 17 00:00:00 2001
From: leu1205 <leu1205@gmail.com>
Date: Fri, 8 May 2020 14:01:11 +0800
Subject: [PATCH] fix panic when continue using WatchRemoteConfig

---
 viper.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/viper.go b/viper.go
index 5226090..9df0db5 100644
--- a/viper.go
+++ b/viper.go
@@ -1775,7 +1775,9 @@ func (v *Viper) watchKeyValueConfigOnChannel() error {
 			for {
 				b := <-rc
 				reader := bytes.NewReader(b.Value)
-				v.unmarshalReader(reader, v.kvstore)
+				kvstore := make(map[string]interface{}, len(v.kvstore))
+				v.unmarshalReader(reader, kvstore)
+				v.kvstore = kvstore
 			}
 		}(respc)
 		return nil
@@ -1801,8 +1803,9 @@ func (v *Viper) watchRemoteConfig(provider RemoteProvider) (map[string]interface
 	if err != nil {
 		return nil, err
 	}
-	err = v.unmarshalReader(reader, v.kvstore)
-	return v.kvstore, err
+	kvstore := make(map[string]interface{}, len(v.kvstore))
+	err = v.unmarshalReader(reader, kvstore)
+	return kvstore, err
 }
 
 // AllKeys returns all keys holding a value, regardless of where they are set.