Merge pull request NixOS#8825 from trofi/search-path-prefix

src/libexpr/search-path.cc: avoid out-of-bounds read on string_view
edolstra · Aug 16, 2023 · 7f8c99c · 7f8c99c
2 parents 5542c1f + b74962c
commit 7f8c99c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/libexpr/search-path.cc b/src/libexpr/search-path.cc
@@ -10,7 +10,7 @@ std::optional<std::string_view> SearchPath::Prefix::suffixIfPotentialMatch(
 
  /* Non-empty prefix and suffix must be separated by a /, or the
  prefix is not a valid path prefix. */
- bool needSeparator = n > 0 && (path.size() - n) > 0;
+ bool needSeparator = n > 0 && n < path.size();
 
  if (needSeparator && path[n] != '/') {
  return std::nullopt;