Mercurial > hg > orthanc

changeset 2779:d67298eec14e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix sandboxing
author am@osimis.io
date Tue, 17 Jul 2018 14:52:32 +0200
parents 8d8d2dbeef11
children d4e81e0a8324
files Core/WebServiceParameters.cpp Core/WebServiceParameters.h
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Core/WebServiceParameters.cpp	Tue Jul 17 14:06:32 2018 +0200
+++ b/Core/WebServiceParameters.cpp	Tue Jul 17 14:52:32 2018 +0200
@@ -315,6 +315,7 @@
   }
 
   
+#if ORTHANC_SANDBOXED == 0
   WebServiceParameters::WebServiceParameters(const Json::Value& serialized) :
     advancedFormat_(true)
   {
@@ -335,4 +336,5 @@
     pkcs11Enabled_ = SerializationToolbox::ReadBoolean(serialized, "PKCS11");
     advancedFormat_ = SerializationToolbox::ReadBoolean(serialized, "AdvancedFormat");
   }
+#endif
 }
--- a/Core/WebServiceParameters.h	Tue Jul 17 14:06:32 2018 +0200
+++ b/Core/WebServiceParameters.h	Tue Jul 17 14:52:32 2018 +0200
@@ -61,7 +61,9 @@
   public:
     WebServiceParameters();
 
+#if ORTHANC_SANDBOXED == 0
     WebServiceParameters(const Json::Value& serialized);
+#endif
 
     const std::string& GetUrl() const
     {