Skip to content

Commit

Permalink
Import upstream openal commit, fixing an assert in debug iterators:
Browse files Browse the repository at this point in the history
Original commit: 94a6230a7295ff93815e2293189d5177fd6fca92
Don't try to sort an empty list
  • Loading branch information
kcat authored and learn-more committed Apr 3, 2024
1 parent 846f605 commit 3718aad
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions libs/openal-soft/core/helpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,18 @@ void DirectorySearch(const std::filesystem::path &path, const std::string_view e
ERR("Exception enumerating files: %s\n", e.what());
}

const al::span newlist{results->begin()+base, results->end()};
std::sort(newlist.begin(), newlist.end());
for(const auto &name : newlist)
TRACE(" got %s\n", name.c_str());
/* HACK: Without the size check this trips up range-checked iterators, as
* al::span uses al::to_address to get the first iterator's data pointer,
* which relies on operator->(), which can assert on end iterators. The
* check shouldn't be needed with C++20's std::span.
*/
if(static_cast<size_t>(base) < results->size())
{
const al::span newlist{results->begin()+base, results->end()};
std::sort(newlist.begin(), newlist.end());
for(const auto &name : newlist)
TRACE(" got %s\n", name.c_str());
}
}

} // namespace
Expand Down

0 comments on commit 3718aad

Please sign in to comment.