X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fwindows.c;h=0fee3e3d5c2f19938ece7c208b4393f89d164d87;hb=6ac951c41a091ffc723840894ddf1e774739511d;hp=faf1f8a642484a37235ae5b29eb3fe9698e75686;hpb=0438f2fc5df337e4264103a86c1765ace9c6565a;p=plomrogue
diff --git a/src/client/windows.c b/src/client/windows.c
index faf1f8a..0fee3e3 100644
--- a/src/client/windows.c
+++ b/src/client/windows.c
@@ -13,6 +13,7 @@
#include /* free() */
#include /* memcpy(), strlen(), strnlen(), memset() */
#include "../common/rexit.h" /* exit_trouble(), exit_err() */
+#include "../common/try_malloc.h" /* try_malloc() */
#include "draw_wins.h" /* draw_winconf_geometry(), draw_winconf_keybindings(),
* draw_win_inventory(), draw_win_info(), draw_win_log(),
* draw_win_available_keybindings(), draw_win_map(),
@@ -146,6 +147,8 @@ static char get_next_win_id()
static void scroll_hint(struct yx_uint16 fsize, char dir, uint16_t dist,
char * unit, struct yx_uint16 start)
{
+ char * f_name = "sprintf()";
+
/* Decide on alignment (vertical/horizontal?), thereby hint text space. */
char * more = "more";
uint16_t dsc_space = fsize.x;
@@ -153,8 +156,10 @@ static void scroll_hint(struct yx_uint16 fsize, char dir, uint16_t dist,
{
dsc_space = fsize.y;
} /* vv-- 10 = max strlen for uint16_t */
- char scrolldsc[1 + strlen(more) + 1 + 10 + 1 + strlen(unit) + 1 + 1];
- sprintf(scrolldsc, " %d %s %s ", dist, more, unit);
+ uint16_t size = 1 + strlen(more) + 1 + 10 + 1 + strlen(unit) + 1 + 1;
+ char * scrolldsc = try_malloc(size, f_name);
+ int test = sprintf(scrolldsc, " %d %s %s ", dist, more, unit);
+ exit_trouble(test < 0, f_name, "sprintf()");
/* Decide on offset of the description text inside the scroll hint line. */
uint16_t dsc_offset = 1;
@@ -188,6 +193,7 @@ static void scroll_hint(struct yx_uint16 fsize, char dir, uint16_t dist,
}
mvwaddch(world.winDB.v_screen, start.y + draw_offset, start.x + q, c);
}
+ free(scrolldsc);
}
@@ -230,7 +236,7 @@ static void draw_win_borderlines(struct Win * w)
offset = (w->frame_size.x - (strlen(w->title) + 2)) / 2;
} /* +2 is for padding/decoration */
uint16_t length_visible = strnlen(w->title, w->frame_size.x - 2);
- char title[length_visible + 3];
+ char * title = try_malloc(length_visible + 3, "draw_win_borderlines()");
char decoration = ' ';
if (w->id == world.winDB.active)
{
@@ -240,6 +246,7 @@ static void draw_win_borderlines(struct Win * w)
title[0] = title[length_visible + 1] = decoration;
title[length_visible + 2] = '\0';
mvwaddstr(world.winDB.v_screen, w->start.y-1, w->start.x+offset, title);
+ free(title);
}
}
@@ -431,16 +438,19 @@ extern void winch_called()
extern void reset_windows_on_winch()
{
+ char * f_name = "reset_windows_on_winch()";
endwin(); /* "[S]tandard way" to recalibrate ncurses post SIGWINCH, says */
refresh(); /* . */
- char tmp_order[strlen(world.winDB.order) + 1];
- sprintf(tmp_order, "%s", world.winDB.order);
+ char * tmp_order = try_malloc(strlen(world.winDB.order) + 1, f_name);
+ int test = sprintf(tmp_order, "%s", world.winDB.order);
+ exit_trouble(test < 0, f_name, "sprintf()");
uint8_t i;
char tmp_active = world.winDB.active;
for (i = 0; i < strlen(tmp_order); toggle_window(tmp_order[i]), i++);
delwin(world.winDB.v_screen);
make_v_screen_and_init_win_sizes();
for (i = 0; i < strlen(tmp_order); toggle_window(tmp_order[i]), i++);
+ free(tmp_order);
world.winDB.active = tmp_active;
}