diff options
| author | Ryan Egesdahl <ryan.egesdahl@mongodb.com> | 2020-05-15 20:26:18 -0700 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-05-20 20:26:44 +0000 |
| commit | 1845ea31140161354ff6308296bde3436d0bd5f9 (patch) | |
| tree | a30365cc9ceed67015c5613fd1dd7705ebb083f0 /src/third_party/SConscript | |
| parent | 675884128ee61da36b910050153861278f42e8cb (diff) | |
| download | mongo-1845ea31140161354ff6308296bde3436d0bd5f9.tar.gz | |
SERVER-48273 SERVER-48273 Backport yaml-cpp CVE fixes from 0.6.3 to 0.6.2
Backport the following yaml-cpp CVE fixes from version 0.6.3 to version 0.6.2:
* CVE-2019-6292
* CVE-2019-6285
Also, backport one fix from 0.6.3 for failing VS2017 builds.
We were previously downloading a source archive for yaml-cpp. To support
easily backporting fixes, it's changed to use git instead.
Diffstat (limited to 'src/third_party/SConscript')
| -rw-r--r-- | src/third_party/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index 8e868e76c52..89f55eb6a72 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -158,7 +158,7 @@ if wiredtiger and not use_system_version_of_library('wiredtiger'): if not use_system_version_of_library('yaml'): thirdPartyEnvironmentModifications['yaml'] = { - 'CPPPATH' : ['#/src/third_party/yaml-cpp' + yamlSuffix + '/include'], + 'CPPPATH' : ['#/src/third_party/yaml-cpp' + yamlSuffix + '/yaml-cpp/include'], 'CPPDEFINES' : ['_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING'] if env.ToolchainIs('msvc') else [], } |