Curses: fix clipped map crash due to uninitialized memory

diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index 1b2457c1a78febab46dd821aa7e448bc1064bf13..ce2f635eb6a6e0d58c60300578e4d869410f2c77 100644 (file)
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -1235,6 +1235,7 @@ curses: messages were tagged by turn in 3.6.x so that ^P can place a separator
 curses: when entering a count while in a menu, cursor would jump to the spot
        on screen where the hero was, even if menu covered that part of map;
        post-3.6--started when curses was changed to use core's get_count()
+curses: clipped map crashed due to uninitialized memory
 Qt: at Xp levels above 20 with 'showexp' On, the combined status field
        "Level:NN/nnnnnnnn" was too big and truncated by a char at each end
 Qt: searching a text window for something that wasn't found and then searching

diff --git a/win/curses/curswins.c b/win/curses/curswins.c
index b22b5ed18272d89aa6f55aedf9b87043dd1b9a50..1d19427a96c24eed853c79828df774ced18d3d6c 100644 (file)
--- a/win/curses/curswins.c
+++ b/win/curses/curswins.c
@@ -629,15 +629,19 @@ curses_draw_map(int sx, int sy, int ex, int ey)
     hsb_back.ch = '-';
     hsb_back.color = SCROLLBAR_BACK_COLOR;
     hsb_back.attr = A_NORMAL;
+    hsb_back.unicode_representation = NULL;
     hsb_bar.ch = '*';
     hsb_bar.color = SCROLLBAR_COLOR;
     hsb_bar.attr = A_NORMAL;
+    hsb_bar.unicode_representation = NULL;
     vsb_back.ch = '|';
     vsb_back.color = SCROLLBAR_BACK_COLOR;
     vsb_back.attr = A_NORMAL;
+    vsb_back.unicode_representation = NULL;
     vsb_bar.ch = '*';
     vsb_bar.color = SCROLLBAR_COLOR;
     vsb_bar.attr = A_NORMAL;
+    vsb_bar.unicode_representation = NULL;
 
     /* Horizontal scrollbar */
     if (sx > 0 || ex < (COLNO - 1)) {