File xterm-CVE-2021-27135.patch of Package xterm.32861

Overview Repositories Revisions Requests Users Attributes Meta

File xterm-CVE-2021-27135.patch of Package xterm.32861

Index: xterm-308/button.c
===================================================================
--- xterm-308.orig/button.c
+++ xterm-308/button.c
@@ -3614,6 +3614,7 @@ SaltTextAway(XtermWidget xw,
     TScreen *screen = TScreenOf(xw);
     int i, j = 0;
     int eol;
+    size_t have = 0;
     int tmp;
     Char *line;
     Char *lp;
@@ -3639,7 +3640,11 @@ SaltTextAway(XtermWidget xw,
 
     /* UTF-8 may require more space */
     if_OPT_WIDE_CHARS(screen, {
-	j *= 4;
+        if (j > 0) {
+            if (screen->max_combining > 0)
+                j += screen->max_combining;
+	    j *= 6;
+        }
     });
 
     /* now get some memory to save it in */
@@ -3676,10 +3681,25 @@ SaltTextAway(XtermWidget xw,
     }
     *lp = '\0';			/* make sure we have end marked */
 
-    TRACE(("Salted TEXT:%d:%s\n", (int) (lp - line),
-	   visibleChars(line, (unsigned) (lp - line))));
-
-    screen->selection_length = (unsigned long) (lp - line);
+    have = (size_t) (lp - line);
+    /*
+     * Scanning the buffer twice is unnecessary.  Discard unwanted memory if
+     * the estimate is too-far off.
+     */
+    if ((have * 2) < (size_t) j) {
+       Char *next;
+       screen->selection_size = have + 1;
+       next = realloc(line, screen->selection_size);
+       if (next == NULL) {
+           free(line);
+           screen->selection_length = 0;
+           screen->selection_size = 0;
+       }
+       screen->selection_data = next;
+    }
+    screen->selection_length = have;
+    TRACE(("Salted TEXT:%d:%s\n", (int) have,
+	   visibleChars(screen->selection_data, (unsigned int) have)));
 }
 
 #if OPT_PASTE64

Places

File xterm-CVE-2021-27135.patch of Package xterm.32861

Places