* ui_screen.c: convert_char_index_to_x() never returns minus value.

arakiken · Jul 29, 2023 · 91b97a0 · 91b97a0
1 parent bce8303
commit 91b97a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2023-07-29  Araki Ken  <arakiken@users.sf.net>
+
+	* ui_screen.c: convert_char_index_to_x() never returns minus value.
+
 2023-06-11  Araki Ken  <arakiken@users.sf.net>
 
 	* configure.in, README, README.ja: Additional information of

diff --git a/uitoolkit/ui_screen.c b/uitoolkit/ui_screen.c
@@ -164,6 +164,11 @@ static int convert_char_index_to_x(
         x -= ui_calculate_vtchar_width(ui_get_font(screen->font_man, vt_char_font(ch)), ch, NULL);
       }
     }
+
+    if (x < 0) {
+      /* XXX This causes screen corruption, but avoids segfault in fb, wayland and sdl2. */
+      x = 0;
+    }
   } else {
     /*
      * excluding the last char width.