diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-04-15 18:05:52 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-04-15 18:05:52 +0300 |
| commit | 70ec3928666353b69efae1bdc831d704fa505e72 (patch) | |
| tree | b84519a00dbfbe4943fd19d0f6d5aff58d0ddd19 /src/frame.c | |
| parent | 7a608fc6f3ded3e615e7accb29f16bfd290d80a1 (diff) | |
| download | emacs-70ec3928666353b69efae1bdc831d704fa505e72.tar.gz | |
Fix the MSDOS build when running under CWSDPMI
* src/msdos.c (the_only_tty_output): Define.
* src/msdos.h (the_only_tty_output): Declare.
* src/frame.c (make_terminal_frame) [MSDOS]:
* src/dispnew.c (init_display) [MSDOS]: Set up
f->output_data.tty pointer using the_only_tty_output, before
dereferencing the pointer. This prevents crashes with DPMI
servers that provide NULL pointer protection.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c index 4ed140d7d08..08925308f9c 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1117,6 +1117,7 @@ make_terminal_frame (struct terminal *terminal) f->terminal = terminal; f->terminal->reference_count++; #ifdef MSDOS + f->output_data.tty = &the_only_tty_output; f->output_data.tty->display_info = &the_only_display_info; if (!inhibit_window_system && (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)) |