From 2354610da5103aa7be66dc2b1a757dd18da37616 Mon Sep 17 00:00:00 2001
From: didier-brizet <dbrizet@snapchat.com>
Date: Wed, 14 Sep 2022 09:28:02 +0200
Subject: [PATCH] Avoid overwriting of default values

---
 src/json-validator.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/json-validator.cpp b/src/json-validator.cpp
index b704a15..7452651 100644
--- a/src/json-validator.cpp
+++ b/src/json-validator.cpp
@@ -974,6 +974,20 @@ public:
 	    : schema(root), required_(r) {}
 };
 
+json find_patch_add(const json::json_pointer &ptr, const json_patch &patch)
+{
+	if (!patch.operator json().is_array()) {
+		return nullptr;
+	}
+	std::string path = ptr.to_string();
+	for (const auto &op : patch.operator json()) {
+		if (op.at("path") == path && op.at("op") == "add") {
+			return op.at("value");
+		}
+	}
+	return nullptr;
+}
+
 class object : public schema
 {
 	std::pair<bool, size_t> maxProperties_{false, 0};
@@ -1037,6 +1051,12 @@ class object : public schema
 		for (auto const &prop : properties_) {
 			const auto finding = instance.find(prop.first);
 			if (instance.end() == finding) { // if the prop is not in the instance
+				{
+					json default_value = find_patch_add((ptr / prop.first), patch);
+					if (!default_value.is_null()) {
+						continue;
+					}
+				}
 				const auto &default_value = prop.second->default_value(ptr, instance, e);
 				if (!default_value.is_null()) { // if default value is available
 					patch.add((ptr / prop.first), default_value);