make sure defaults are non-array object before object.assigning

prebid · Nov 29, 2017 · 131fc7c · 131fc7c
1 parent 89d8c0e
commit 131fc7c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/config.js b/src/config.js
@@ -152,6 +152,7 @@ export function newConfig() {
    * subscribes to configuration updates. See `subscribe` function for usage.
    */
   function getConfig(...args) {
+    // deep merge config with defaults
     let configWithDefaults = Object.assign({}, defaults, config).keys().reduce((memo, key) => {
       let c = config[key];
       let d = defaults[key];
@@ -161,8 +162,11 @@ export function newConfig() {
       }
 
       if (typeof c !== 'undefined') {
-        if (typeof c === 'object' && !Array.isArray(c)) {
-          memo[key] = Object.assign({}, memo[key], c);
+        if (
+          typeof d === 'object' && !Array.isArray(d) &&
+          typeof c === 'object' && !Array.isArray(c)
+        ) {
+          memo[key] = Object.assign({}, d, c);
         } else {
           memo[key] = c;
         }