nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Make TermWin's palette_get_overrides() take a Terminal *.

Browse Source 
Less than 12 hours after 0.75 went out of the door, a user pointed out
that enabling the 'Use system colours' config option causes an
immediate NULL-dereference crash. The reason is because a chain of
calls from term_init() ends up calling back to the Windows
implementation of the palette_get_overrides() method, which responds
by trying to call functions on the static variable 'term' in window.c,
which won't be initialised until term_init() has returned.

Simple fix: palette_get_overrides() is now given a pointer to the
Terminal that it should be updating, because it can't find it out any
other way.

(cherry picked from commit 571fa3388d)
This commit is contained in:
Simon Tatham 2021-05-08 18:13:06 +01:00
parent c72200ff88
commit 329bdb344c
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuzzterm.c
View File

@ -93,7 +93,7 @@ static void fuzz_move(TermWin *tw, int x, int y) {}
static void fuzz_set_zorder(TermWin *tw, bool top) {} static void fuzz_set_zorder(TermWin *tw, bool top) {}
static void fuzz_palette_set(TermWin *tw, unsigned start, unsigned ncolours, static void fuzz_palette_set(TermWin *tw, unsigned start, unsigned ncolours,
const rgb *colours) {} const rgb *colours) {}
static void fuzz_palette_get_overrides(TermWin *tw) {} static void fuzz_palette_get_overrides(TermWin *tw, Terminal *term) {}
static const TermWinVtable fuzz_termwin_vt = { static const TermWinVtable fuzz_termwin_vt = {
.setup_draw_ctx = fuzz_setup_draw_ctx, .setup_draw_ctx = fuzz_setup_draw_ctx,

14
putty.h
View File

@ -1299,8 +1299,14 @@ struct TermWinVtable {
/* Query the front end for any OS-local overrides to the default /* Query the front end for any OS-local overrides to the default
* colours stored in Conf. The front end should set any it cares * colours stored in Conf. The front end should set any it cares
* about by calling term_palette_override. */ * about by calling term_palette_override.
void (*palette_get_overrides)(TermWin *); *
* The Terminal object is passed in as a parameter, because this
* can be called as a callback from term_init(). So the TermWin
* itself won't yet have been told where to find its Terminal
* object, because that doesn't happen until term_init
* returns. */
void (*palette_get_overrides)(TermWin *, Terminal *);
}; };
static inline bool win_setup_draw_ctx(TermWin *win) static inline bool win_setup_draw_ctx(TermWin *win)
@ -1354,8 +1360,8 @@ static inline void win_set_zorder(TermWin *win, bool top)
static inline void win_palette_set( static inline void win_palette_set(
TermWin *win, unsigned start, unsigned ncolours, const rgb *colours) TermWin *win, unsigned start, unsigned ncolours, const rgb *colours)
{ win->vt->palette_set(win, start, ncolours, colours); } { win->vt->palette_set(win, start, ncolours, colours); }
static inline void win_palette_get_overrides(TermWin *win) static inline void win_palette_get_overrides(TermWin *win, Terminal *term)
{ win->vt->palette_get_overrides(win); } { win->vt->palette_get_overrides(win, term); }
/* /*
* Global functions not specific to a connection instance. * Global functions not specific to a connection instance.

2
terminal.c
View File

@ -1874,7 +1874,7 @@ static void palette_reset(Terminal *term, bool overrides_only)
*/ */
for (unsigned i = 0; i < OSC4_NCOLOURS; i++) for (unsigned i = 0; i < OSC4_NCOLOURS; i++)
term->subpalettes[SUBPAL_PLATFORM].present[i] = false; term->subpalettes[SUBPAL_PLATFORM].present[i] = false;
win_palette_get_overrides(term->win); win_palette_get_overrides(term->win, term);
/* /*
* Rebuild the composite palette. * Rebuild the composite palette.

2
unix/gtkwin.c
View File

@ -2614,7 +2614,7 @@ static void gtkwin_palette_set(TermWin *tw, unsigned start, unsigned ncolours,
} }
} }
static void gtkwin_palette_get_overrides(TermWin *tw) static void gtkwin_palette_get_overrides(TermWin *tw, Terminal *term)
{ {
/* GTK has no analogue of Windows's 'standard system colours', so GTK PuTTY /* GTK has no analogue of Windows's 'standard system colours', so GTK PuTTY
* has no config option to override the normally configured colours from * has no config option to override the normally configured colours from

4
windows/window.c
View File

@ -263,7 +263,7 @@ static void wintw_set_maximised(TermWin *, bool maximised);
static void wintw_move(TermWin *, int x, int y); static void wintw_move(TermWin *, int x, int y);
static void wintw_set_zorder(TermWin *, bool top); static void wintw_set_zorder(TermWin *, bool top);
static void wintw_palette_set(TermWin *, unsigned, unsigned, const rgb *); static void wintw_palette_set(TermWin *, unsigned, unsigned, const rgb *);
static void wintw_palette_get_overrides(TermWin *); static void wintw_palette_get_overrides(TermWin *, Terminal *);
static const TermWinVtable windows_termwin_vt = { static const TermWinVtable windows_termwin_vt = {
.setup_draw_ctx = wintw_setup_draw_ctx, .setup_draw_ctx = wintw_setup_draw_ctx,
@ -1214,7 +1214,7 @@ static inline rgb rgb_from_colorref(COLORREF cr)
return toret; return toret;
} }
static void wintw_palette_get_overrides(TermWin *tw) static void wintw_palette_get_overrides(TermWin *tw, Terminal *term)
{ {
if (conf_get_bool(conf, CONF_system_colour)) { if (conf_get_bool(conf, CONF_system_colour)) {
rgb rgb; rgb rgb;