Tag: check bulk mode in Clear()

ba79f4c1 · Max Kellermann · 8b2dcf70 · ba79f4c1
Commit ba79f4c1 authored Jul 31, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

Tag.cxx src/Tag.cxx +8 -1

No files found.
--- a/src/Tag.cxx
+++ b/src/Tag.cxx
@@ -143,7 +143,14 @@ Tag::Clear()
 		tag_pool_put_item(items[i]);
 	tag_pool_lock.unlock();

-	g_free(items);
+	if (items == bulk.items) {
+#ifndef NDEBUG
+		assert(bulk.busy);
+		bulk.busy = false;
+#endif
+	} else
+		g_free(items);
+
 	items = nullptr;
 	num_items = 0;
 }