Changeset 9fd74d5 in mainline

Timestamp:

2025-11-09T16:20:43Z (3 days ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

a4301f1

Parents:

e6b4d2d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-11-09 16:19:21)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-11-09 16:20:43)

Message:

libtermui: Ensure fully consistent history state when evicting old data

Fixes bug #890

Location:

uspace/lib/termui/src

Files:

• history.c (modified) (2 diffs)
• history.h (modified) (1 diff)

uspace/lib/termui/src/history.c

@@ -126 +126 @@
 
 #define _history_check(history) do { \
-        assert(history->lines.head < history->lines.buf_len); \
-        assert(history->lines.tail < history->lines.buf_len); \
+        assert(history->lines.head < history->lines.buf_len || history->lines.head == 0); \
+        assert(history->lines.tail < history->lines.buf_len || history->lines.tail == 0); \
         assert(history->cells.tail_top <= history->cells.head_offset); \
         assert(history->cells.head_offset <= history->cells.head_top); \
@@ -298 +298 @@
         if (lines->tail >= lines->buf_len)
                 lines->tail = 0;
+
+        if (viewport_inactive) {
+            /* Ensure consistent state so asserts don't trigger inside _evict_oldest_line(). */
+            history->viewport_top = lines->tail;
+        }
 
         if (lines->tail == lines->head)

uspace/lib/termui/src/history.h

@@ -66 +66 @@
 };
 
+/* History consists of two circular buffers.
+ * The cell buffer is a linear array of character cells.
+ * The line buffer contains offsets into the cell buffer, and segments it into logical lines.
+ * Both of these buffers have a maximum size, so history is limited both by maximum number
+ * of characters, and maximum number of lines.  */
 struct history {
         size_t viewport_top;