Changeset 597b12e in mainline

Timestamp:

2012-07-30T18:20:54Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

1772e6d, bd29f9c9

Parents:

6e3b052d

Message:

Fix a possible numeric overflow introduced by the previous commit.

File:

• uspace/lib/clui/tinput.c (modified) (1 diff)

uspace/lib/clui/tinput.c ¶

@@ -601 +601 @@
         
         unsigned int cols = max(1, (ti->con_cols + 1) / (max_length + 1));
-        unsigned int padding = ti->con_cols - (cols * max_length) - (cols - 1);
+        unsigned int padding = 0;
+        if ((cols * max_length) + (cols - 1) < ti->con_cols) {
+                padding = ti->con_cols - (cols * max_length) - (cols - 1);
+        }
         unsigned int col_width = max_length + padding / cols;
         unsigned int rows = cnum / cols + ((cnum % cols) != 0);