diff --git a/paraview-5.4.1-jsoncpp_184.patch b/paraview-5.4.1-jsoncpp_184.patch index c82490b..7bb440e 100644 --- a/paraview-5.4.1-jsoncpp_184.patch +++ b/paraview-5.4.1-jsoncpp_184.patch @@ -1,4 +1,4 @@ -commit d0a81cb5385bc6ec44b030ef98678be341d17c5e +commit eebbc8945b52dde98445e0f87aeffdf0992e0354 Author: Björn Esser Date: Sun Jan 14 22:36:53 2018 +0100 @@ -7,15 +7,17 @@ Date: Sun Jan 14 22:36:53 2018 +0100 Fixes #17909 diff --git a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx -index b6e2b5592a..22ac8da5d9 100644 +index b6e2b5592a..226180a5ba 100644 --- a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx +++ b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx -@@ -788,7 +788,9 @@ public: +@@ -788,7 +788,11 @@ public: this->GetSettingBelowPriority(propertySettingCString, highestPriority); if (lowerPriorityValue.isNull()) { - if (!proxyValue.removeMember(property->GetXMLName()).isNull()) -+ Json::Value& removedValue; ++ // Can't use reference here, since we need a valid empty object for ++ // deep-copying the removed member. ++ Json::Value removedValue; + if (proxyValue.removeMember(property->GetXMLName(), &removedValue) && + !removedValue.isNull()) {