Commit 2883d842 authored by Jason Rumney's avatar Jason Rumney

* w32select.c (Fw32_set_clipboard_data): Make coding iso2022 safe.

* w32fns.c (x_to_w32_font): Likewise.
parent 95e224b7
2004-02-03 Jason Rumney <jasonr@gnu.org>
* w32select.c (Fw32_set_clipboard_data): Make coding iso2022 safe.
* w32fns.c (x_to_w32_font): Likewise.
2004-02-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xterm.h: Add x_handle_dnd_message, x_check_property_data,
......
......@@ -5558,6 +5558,11 @@ x_to_w32_font (lpxstr, lplogfont)
(Fcheck_coding_system (Vlocale_coding_system), &coding);
coding.src_multibyte = 1;
coding.dst_multibyte = 1;
/* Need to set COMPOSITION_DISABLED, otherwise Emacs crashes in
encode_coding_iso2022 trying to dereference a null pointer. */
coding.composing = COMPOSITION_DISABLED;
if (coding.type == coding_type_iso2022)
coding.flags |= CODING_FLAG_ISO_SAFE;
bufsize = encoding_buffer_size (&coding, strlen (name));
buf = (unsigned char *) alloca (bufsize);
coding.mode |= CODING_MODE_LAST_BLOCK;
......
......@@ -212,6 +212,11 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data,
}
coding.src_multibyte = 1;
coding.dst_multibyte = 0;
/* Need to set COMPOSITION_DISABLED, otherwise Emacs crashes in
encode_coding_iso2022 trying to dereference a null pointer. */
coding.composing = COMPOSITION_DISABLED;
if (coding.type == coding_type_iso2022)
coding.flags |= CODING_FLAG_ISO_SAFE;
Vnext_selection_coding_system = Qnil;
coding.mode |= CODING_MODE_LAST_BLOCK;
bufsize = encoding_buffer_size (&coding, nbytes);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment