Fix zero-sized entry issue by including end when sorting entries

milasudril · Jul 5, 2023 · 529c09d · 529c09d
1 parent 0856294
commit 529c09d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/directory.cpp b/lib/directory.cpp
@@ -170,7 +170,7 @@ std::vector<Wad64::DirEntry> Wad64::fileOffsets(Wad64::Directory const& dir)
 	file_offsets.reserve(std::size(entries));
 	std::ranges::transform(
 	    entries, std::back_inserter(file_offsets), [](auto const& item) { return item.second; });
-	std::ranges::sort(file_offsets, [](auto a, auto b) { return a.begin < b.begin; });
+	std::ranges::sort(file_offsets);
 
 	return file_offsets;
 }

diff --git a/lib/directory.hpp b/lib/directory.hpp
@@ -23,7 +23,7 @@ namespace Wad64
 		int64_t begin;
 		int64_t end;
 
-		auto operator<=>(DirEntry const& a) const = default;
+		constexpr auto operator<=>(DirEntry const& a) const = default;
 	};
 
 	struct Gap

diff --git a/lib/directory.test.cpp b/lib/directory.test.cpp
@@ -521,8 +521,8 @@ namespace Testcases
 			Wad64::FileLump{0xde, 0x0, {'A'}},
 			Wad64::FileLump{0xde, 0x0, {'B'}},
 			Wad64::FileLump{0x18, 0xc6, {'C'}},
-			Wad64::FileLump{0x18 + 0xc6, 0x0, {'D'}},
-			Wad64::FileLump{0x18 + 0xc6, 0x0, {'E'}},
+			Wad64::FileLump{0x18, 0x0, {'D'}},
+			Wad64::FileLump{0x18, 0x0, {'E'}},
 			Wad64::FileLump{0xed, 0xd4, {'F'}}
 		};