diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake index d6e7dfb..e40ea5c 100644 --- a/cmake/abseil-cpp.cmake +++ b/cmake/abseil-cpp.cmake @@ -17,7 +17,7 @@ set(workdir "${CMAKE_BINARY_DIR}/_deps/absl-populate") set(SAPI_ABSL_GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git CACHE STRING "") set(SAPI_ABSL_GIT_TAG b315753c0b8b4aa4e3e1479375eddb518393bab6 - CACHE STRING "") # 2020-11-19 + CACHE STRING "") # 2021-02-18 set(SAPI_ABSL_SOURCE_DIR "${CMAKE_BINARY_DIR}/_deps/absl-src" CACHE STRING "") set(SAPI_ABSL_BINARY_DIR "${CMAKE_BINARY_DIR}/_deps/absl-build" CACHE STRING "") diff --git a/sandboxed_api/sandbox2/mounts.cc b/sandboxed_api/sandbox2/mounts.cc index 60c772f..d9de087 100644 --- a/sandboxed_api/sandbox2/mounts.cc +++ b/sandboxed_api/sandbox2/mounts.cc @@ -51,7 +51,7 @@ namespace file_util = ::sapi::file_util; namespace host_cpu = ::sapi::host_cpu; bool PathContainsNullByte(absl::string_view path) { - return absl::StrContains(path, '\x00'); + return absl::StrContains(path, '\0'); } bool IsSameFile(const std::string& path1, const std::string& path2) { @@ -277,7 +277,7 @@ absl::StatusOr Mounts::ResolvePath(absl::string_view path) const { while (!tail.empty()) { std::pair parts = absl::StrSplit(tail, absl::MaxSplits('/', 1)); - absl::string_view cur = parts.first; + const std::string cur(parts.first); tail = parts.second; const auto it = curtree->entries().find(cur); if (it == curtree->entries().end()) {