sdk/queue: move lock before checking queue length (#13146) (#13297)

* sdk/queue: move lock before checking queue length * Add changelog
hashicorp · Nov 29, 2021 · e36348b · e36348b
1 parent 8d2b80c
commit e36348b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/changelog/13146.txt b/changelog/13146.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+sdk/queue: move lock before length check to prevent panics.
+```
diff --git a/sdk/queue/priority_queue.go b/sdk/queue/priority_queue.go
@@ -85,13 +85,13 @@ func (pq *PriorityQueue) Len() int {
 // wrapper/convenience method that calls heap.Pop, so consumers do not need to
 // invoke heap functions directly
 func (pq *PriorityQueue) Pop() (*Item, error) {
-	if pq.Len() == 0 {
-		return nil, ErrEmpty
-	}
-
 	pq.lock.Lock()
 	defer pq.lock.Unlock()
 
+	if pq.data.Len() == 0 {
+		return nil, ErrEmpty
+	}
+
 	item := heap.Pop(&pq.data).(*Item)
 	delete(pq.dataMap, item.Key)
 	return item, nil