[FIXED] Fix for a panic calculating record length for slotInfo when followed by dbit markers in idx.

server/filestore.go

@@ -3921,11 +3921,24 @@ func (mb *msgBlock) slotInfo(slot int) (uint32, uint32, bool, error) {
 
 	// Determine record length
 	var rl uint32
-	if len(mb.cache.idx) > slot+1 {
-		ni := mb.cache.idx[slot+1] &^ hbit
-		rl = ni - ri
-	} else {
+	if slot >= len(mb.cache.idx) {
 		rl = mb.cache.lrl
+	} else {
+		// Need to account for dbit markers in idx.
+		// So we will walk until we find valid idx slot to calculate rl.
+		for i := 1; slot+i < len(mb.cache.idx); i++ {
+			ni := mb.cache.idx[slot+i] &^ hbit
+			if ni == dbit {
+				continue
+			}
+			rl = ni - ri
+			break
+		}
+		// check if we had all trailing dbits.
+		// If so use len of cache buf minus ri.
+		if rl == 0 {
+			rl = uint32(len(mb.cache.buf)) - ri
+		}
 	}
 	if rl < msgHdrSize {
 		return 0, 0, false, errBadMsg
@@ -5659,7 +5672,7 @@ const (
 	ebit = 1 << 63
 	// Used for marking tombstone sequences.
 	tbit = 1 << 62
-	// Used to mark a bad index as deleted.
+	// Used to mark an index as deleted and non-existent.
 	dbit = 1 << 30
 )
 

server/filestore_test.go

@@ -6558,6 +6558,61 @@ func TestFileStoreWriteFullStateHighSubjectCardinality(t *testing.T) {
 	t.Logf("Took %s to writeFullState", time.Since(start))
 }
 
+func TestFileStoreEraseMsgWithDbitSlots(t *testing.T) {
+	fs, err := newFileStore(
+		FileStoreConfig{StoreDir: t.TempDir()},
+		StreamConfig{Name: "zzz", Subjects: []string{"foo"}, Storage: FileStorage})
+	require_NoError(t, err)
+	defer fs.Stop()
+
+	fs.StoreMsg("foo", nil, []byte("abd"))
+	for i := 0; i < 10; i++ {
+		fs.SkipMsg()
+	}
+	fs.StoreMsg("foo", nil, []byte("abd"))
+	// Now grab that first block and compact away the skips which will
+	// introduce dbits into our idx.
+	fs.mu.RLock()
+	mb := fs.blks[0]
+	fs.mu.RUnlock()
+	// Compact.
+	mb.mu.Lock()
+	mb.compact()
+	mb.mu.Unlock()
+
+	removed, err := fs.EraseMsg(1)
+	require_NoError(t, err)
+	require_True(t, removed)
+}
+
+func TestFileStoreEraseMsgWithAllTrailingDbitSlots(t *testing.T) {
+	fs, err := newFileStore(
+		FileStoreConfig{StoreDir: t.TempDir()},
+		StreamConfig{Name: "zzz", Subjects: []string{"foo"}, Storage: FileStorage})
+	require_NoError(t, err)
+	defer fs.Stop()
+
+	fs.StoreMsg("foo", nil, []byte("abc"))
+	fs.StoreMsg("foo", nil, []byte("abcdefg"))
+
+	for i := 0; i < 10; i++ {
+		fs.SkipMsg()
+	}
+	// Now grab that first block and compact away the skips which will
+	// introduce dbits into our idx.
+	fs.mu.RLock()
+	mb := fs.blks[0]
+	fs.mu.RUnlock()
+	// Compact.
+	mb.mu.Lock()
+	mb.compact()
+	mb.mu.Unlock()
+
+	removed, err := fs.EraseMsg(2)
+	require_NoError(t, err)
+	require_True(t, removed)
+}
+
 ///////////////////////////////////////////////////////////////////////////
 // Benchmarks
 ///////////////////////////////////////////////////////////////////////////