Changeset 5bbb4453 in mainline for uspace/app/nav/panel.c

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f59212cc

Parents:

97c3c59

git-author:

Jiri Svoboda <jiri@…> (2021-10-19 20:01:48)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Make sure page is not beyond end of list

Need to correct max_idx correctly for short lists (was getting a
negative number and putting it to a size_t). Need to prevent
page going beyond end of list when moving up a dir and seeking
to the entry of directory we just exited (unless the list is short).

File:

• uspace/app/nav/panel.c (modified) (3 diffs)

uspace/app/nav/panel.c

@@ -523 +523 @@
         char *olddn;
         size_t pg_size;
+        size_t max_idx;
         size_t i;
         errno_t rc;
@@ -617 +618 @@
                                 --panel->page_idx;
                         }
+
+                        /* Make sure page is not beyond the end if possible */
+                        if (panel->entries_cnt > pg_size)
+                                max_idx = panel->entries_cnt - pg_size;
+                        else
+                                max_idx = 0;
+
+                        while (panel->page_idx > 0 && panel->page_idx > max_idx) {
+                                prev = panel_prev(panel->page);
+                                if (prev == NULL)
+                                        break;
+
+                                panel->page = prev;
+                                --panel->page_idx;
+                        }
                 }
         }
@@ -948 +964 @@
         old_cursor = panel->cursor;
         old_idx = panel->cursor_idx;
-        max_idx = panel->entries_cnt - rows;
+
+        if (panel->entries_cnt > rows)
+                max_idx = panel->entries_cnt - rows;
+        else
+                max_idx = 0;
 
         /* Move page by rows entries down (if possible) */