Set owner queue to nullptr after commit in scopes

joz-k · joz-k · commit 5ed1c864f00b · 2025-08-18T10:39:41.000+02:00
In both WriteScope and ReadScope destructors, set m_owner_queue to nullptr after committing to prevent potential double commits or use-after-free issues.
diff --git a/include/LockFreeSpscQueue.h b/include/LockFreeSpscQueue.h
@@ -92,7 +92,10 @@ class LockFreeSpscQueue
 
         ~WriteScope() noexcept
         {
-            if (m_owner_queue != nullptr) { m_owner_queue->commit_write(get_items_written()); }
+            if (m_owner_queue != nullptr) {
+                m_owner_queue->commit_write(get_items_written());
+                m_owner_queue = nullptr;
+            }
         }
 
         // This RAII object is move-only to ensure single ownership of a transaction.
@@ -158,7 +161,10 @@ class LockFreeSpscQueue
 
         ~ReadScope() noexcept
         {
-            if (m_owner_queue != nullptr) { m_owner_queue->commit_read(get_items_read()); }
+            if (m_owner_queue != nullptr) {
+                m_owner_queue->commit_read(get_items_read());
+                m_owner_queue = nullptr;
+            }
         }
 
         // This RAII object is move-only to ensure single ownership of a transaction.

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,10 @@ class LockFreeSpscQueue`
`92`	`92`
`93`	`93`	`~WriteScope() noexcept`
`94`	`94`	`{`
`95`		`- if (m_owner_queue != nullptr) { m_owner_queue->commit_write(get_items_written()); }`
	`95`	`+ if (m_owner_queue != nullptr) {`
	`96`	`+ m_owner_queue->commit_write(get_items_written());`
	`97`	`+ m_owner_queue = nullptr;`
	`98`	`+ }`
`96`	`99`	`}`
`97`	`100`
`98`	`101`	`// This RAII object is move-only to ensure single ownership of a transaction.`
`@@ -158,7 +161,10 @@ class LockFreeSpscQueue`
`158`	`161`
`159`	`162`	`~ReadScope() noexcept`
`160`	`163`	`{`
`161`		`- if (m_owner_queue != nullptr) { m_owner_queue->commit_read(get_items_read()); }`
	`164`	`+ if (m_owner_queue != nullptr) {`
	`165`	`+ m_owner_queue->commit_read(get_items_read());`
	`166`	`+ m_owner_queue = nullptr;`
	`167`	`+ }`
`162`	`168`	`}`
`163`	`169`
`164`	`170`	`// This RAII object is move-only to ensure single ownership of a transaction.`