From 78baa16da020ec9ad741b8f3f9c6168ec77ef58d Mon Sep 17 00:00:00 2001
From: Literally Void <literallyvoid@gmail.com>
Date: Wed, 9 Sep 2020 20:49:49 -0700
Subject: Fix issue #6303: iterating empty PriorityQueue crashes

---
 lib/std/priority_queue.zig | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'lib/std/priority_queue.zig')

diff --git a/lib/std/priority_queue.zig b/lib/std/priority_queue.zig
index 1c0d230d4d..b9be9b70bf 100644
--- a/lib/std/priority_queue.zig
+++ b/lib/std/priority_queue.zig
@@ -195,7 +195,7 @@ pub fn PriorityQueue(comptime T: type) type {
             count: usize,
 
             pub fn next(it: *Iterator) ?T {
-                if (it.count > it.queue.len - 1) return null;
+                if (it.count >= it.queue.len) return null;
                 const out = it.count;
                 it.count += 1;
                 return it.queue.items[out];
@@ -428,3 +428,12 @@ test "std.PriorityQueue: remove at index" {
     expectEqual(queue.remove(), 3);
     expectEqual(queue.removeOrNull(), null);
 }
+
+test "std.PriorityQueue: iterator while empty" {
+    var queue = PQ.init(testing.allocator, lessThan);
+    defer queue.deinit();
+
+    var it = queue.iterator();
+
+    expectEqual(it.next(), null);
+}
-- 
cgit v1.2.3