Revert "tag/Pool: use strncmp() without strlen() to compare strings"

This reverts commit 1532983f. This optimization was bad because now all strings match if they are a prefix of another string, and this caused collisions in the tag string pool, corrupting the database.

Revert "tag/Pool: use strncmp() without strlen() to compare strings"
650a30d7 · Max Kellermann · 1dc71f38 · 650a30d7 · 650a30d7
Commit 650a30d7 authored Apr 15, 2021 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

NEWS NEWS +2 -0

Pool.cxx src/tag/Pool.cxx +1 -4

No files found.
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ ver 0.22.7 (not yet released)
  - gme: support RSN files
 * storage
  - curl: don't use glibc extension
+* database
+  - simple: fix database corruption bug
 * output
  - httpd: send header "Access-Control-Allow-Origin: *"
  - wasapi: add algorithm for finding usable audio format

--- a/src/tag/Pool.cxx
+++ b/src/tag/Pool.cxx
@@ -114,10 +114,7 @@ tag_pool_get_item(TagType type, StringView value) noexcept
 	auto slot_p = tag_value_slot_p(type, value);
 	for (auto slot = *slot_p; slot != nullptr; slot = slot->next) {
 		if (slot->item.type == type &&
-		    /* strncmp() only works if there are no null
-		       bytes, which FixTagString() has already ensured
-		       at this point */
-		    strncmp(value.data, slot->item.value, value.size) == 0 &&
+		    value.Equals(slot->item.value) &&
 		    slot->ref < TagPoolSlot::MAX_REF) {
 			assert(slot->ref > 0);
 			++slot->ref;