Client: Fix buggy log window size pre-calculating triggering segfaults.

[plomrogue] / src / client / draw_wins.c

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index c0d3d8ae4a29d2615f7439a87e52e064879a3a8f..ec2917347903b5ae6b44f4907fe7b291127c26c3 100644 (file)
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -338,7 +338,7 @@ static char * winconf_geom_helper(struct Win * win, char axis, char * sep,
     uint8_t size =   strlen(p0) + strlen(p1) + strlen(p2) + strlen(sep)
                    + strlen(p4) + strlen(sep) + strlen(p6) +strlen(value_prefix)
                    + strlen(p8) + strlen(p9) + strlen(p10) + strlen(p11)
-                   + strlen(newlines);
+                   + strlen(newlines) + 1;
     char * msg = try_malloc(size, __func__);
     sprintf(msg, "%s%s%s%s%s%s%s%s%s%s%s%s%s", p0, p1, p2, sep, p4, sep, p6,
             value_prefix, p8, p9, p10, p11, newlines);
@@ -354,13 +354,15 @@ extern void draw_win_log(struct Win * win)
         return;
     }
     uint32_t x, i, n_postbreak_lines;
-    for (i = 0, x = 0, n_postbreak_lines = 0; i < strlen(world.log); i++)
+    for (i = 0, x = 0, n_postbreak_lines = 1; i < strlen(world.log); i++)
     {
         exit_err(i == UINT32_MAX, "Log too large.");
         x++;
-        n_postbreak_lines = n_postbreak_lines + (x == win->frame_size.x);
-        n_postbreak_lines = n_postbreak_lines + ('\n' == world.log[i]);
-        x = ((x == win->frame_size.x) || ('\n' == world.log[i])) ? 0 : x;
+        if (x > win->frame_size.x || '\n' == world.log[i])
+        {
+            n_postbreak_lines++;
+            x = 0;
+        }
     }
     if (n_postbreak_lines > win->frame_size.y)
     {