json_object_merge(): Only recurse if both source and destination are …

…objects. Turns out that we might like to completely overwrite objects with other data types.
thpatch · May 18, 2014 · 5f31a8f · 5f31a8f
1 parent cca89be
commit 5f31a8f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/thcrap/src/jansson_ex.c b/thcrap/src/jansson_ex.c
@@ -195,7 +195,7 @@ json_t* json_object_merge(json_t *old_obj, const json_t *new_obj)
 	}
 	json_object_foreach((json_t*)new_obj, key, new_val) {
 		json_t *old_val = json_object_get(old_obj, key);
-		if(json_is_object(old_val)) {
+		if(json_is_object(old_val) && json_is_object(new_val)) {
 			// Recursion!
 			json_object_merge(old_val, new_val);
 		} else {