update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / process / detail / posix / environment.hpp

diff --git a/ceph/src/boost/boost/process/detail/posix/environment.hpp b/ceph/src/boost/boost/process/detail/posix/environment.hpp
index 58334741ae6d3e8e7535cee324dd1ddeb574e57c..871afd1cb125d8071d9e8c0ea4c4f8ca79c5062b 100644 (file)
--- a/ceph/src/boost/boost/process/detail/posix/environment.hpp
+++ b/ceph/src/boost/boost/process/detail/posix/environment.hpp
@@ -94,7 +94,7 @@ public:
     native_environment_impl & operator=(native_environment_impl && ) = default;
     native_handle_type _env_impl = _impl.data();
 
-    native_handle_type native_handle() const {return environ;}
+    native_handle_type native_handle() const {return _env_impl;}
 };
 
 template<>
@@ -294,7 +294,11 @@ std::vector<Char*> basic_environment_impl<Char>::_load_var(std::vector<std::basi
     ret.reserve(data.size() +1);
 
     for (auto & val : data)
+    {
+        if (val.empty())
+            val.push_back(0);
         ret.push_back(&val.front());
+    }
 
     ret.push_back(nullptr);
     return ret;