fix getID will cause endless loop when noFreeID

eclipse · May 16, 2020 · 70d0d6c · 70d0d6c
1 parent 4c98a23
commit 70d0d6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/messageids.go b/messageids.go
@@ -76,7 +76,7 @@ func (mids *messageIds) claimID(token tokenCompletor, id uint16) {
 func (mids *messageIds) getID(t tokenCompletor) uint16 {
 	mids.Lock()
 	defer mids.Unlock()
-	for i := midMin; i <= midMax; i++ {
+	for i := midMin; i <= midMax && i != 0; i++ {
 		if _, ok := mids.index[i]; !ok {
 			mids.index[i] = t
 			return i

diff --git a/unit_messageids_test.go b/unit_messageids_test.go
@@ -71,4 +71,9 @@ func Test_noFreeID(t *testing.T) {
 	if mid != 0 {
 		t.Errorf("shouldn't be any mids left")
 	}
+
+	mid = mids.getID(&d)
+	if mid != 0 {
+		t.Errorf("shouldn't be any mids left")
+	}
 }