fix(config_compiler): null value should not overwrite a normal key in a merged tree

lotem · lotem · commit 4ecae44b5e31 · 2017-09-15T20:37:52.000+08:00
diff --git a/src/rime/config/config_compiler.cc b/src/rime/config/config_compiler.cc
@@ -140,7 +140,7 @@ inline static bool IsMerging(const string& key,
                              bool merge_tree) {
   return key == ConfigCompiler::MERGE_DIRECTIVE ||
       boost::ends_with(key, ADD_SUFFIX_OPERATOR) ||
-      (merge_tree && Is<ConfigMap>(value) &&
+      (merge_tree && (!value || Is<ConfigMap>(value)) &&
        !boost::ends_with(key, EQU_SUFFIX_OPERATOR));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ inline static bool IsMerging(const string& key,`
`140`	`140`	`bool merge_tree) {`
`141`	`141`	`return key == ConfigCompiler::MERGE_DIRECTIVE \|\|`
`142`	`142`	`boost::ends_with(key, ADD_SUFFIX_OPERATOR) \|\|`
`143`		`- (merge_tree && Is<ConfigMap>(value) &&`
	`143`	`+ (merge_tree && (!value \|\| Is<ConfigMap>(value)) &&`
`144`	`144`	`!boost::ends_with(key, EQU_SUFFIX_OPERATOR));`
`145`	`145`	`}`
`146`	`146`