From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 28 Apr 2020 08:57:16 +0000 (+0300)
Subject: Avoid crashes on TTY frames with over-long compositions
X-Git-Tag: emacs-27.1-rc1~175
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=16fed05ba85c3d92d3c913657dd50a648ad3884a;p=emacs.git

Avoid crashes on TTY frames with over-long compositions

* src/term.c (encode_terminal_code): Each character from an
automatic composition is a multibyte character, so its multibyte
representation can take up to MAX_MULTIBYTE_LENGTH bytes.
Account for that when allocating storage for characters to be
encoded.  (Bug#40913)
---

diff --git a/src/term.c b/src/term.c
index a3aef31ec25..94bf013f4a0 100644
--- a/src/term.c
+++ b/src/term.c
@@ -563,8 +563,8 @@ encode_terminal_code (struct glyph *src, int src_len,
 	    {
 	      cmp = composition_table[src->u.cmp.id];
 	      required = cmp->glyph_len;
-	      required *= MAX_MULTIBYTE_LENGTH;
 	    }
+	  required *= MAX_MULTIBYTE_LENGTH;
 
 	  if (encode_terminal_src_size - nbytes < required)
 	    {