From bacd7ae4b6dbe3b8c8d5bcf100f97b4e856aac39 Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Tue, 8 Mar 2022 09:14:41 +0800
Subject: [PATCH] Avoid color leaks while better ensuring a close color is
 found

* src/xterm.c (x_alloc_nearest_color_1): Verify nearest can be
allocated, and use that color value.
---
 src/xterm.c | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index e20f9ca406d..52df2e9f046 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3858,10 +3858,12 @@ x_alloc_nearest_color_1 (Display *dpy, Colormap cmap, XColor *color)
       Status status;
       bool retry = false;
       int ncolor_cells, i;
+      bool temp_allocated;
+      XColor temp;
 
     start:
-
       cells = x_color_cells (dpy, &no_cells);
+      temp_allocated = false;
 
       nearest = 0;
       /* I'm assuming CSE so I'm not going to condense this. */
@@ -3881,16 +3883,39 @@ x_alloc_nearest_color_1 (Display *dpy, Colormap cmap, XColor *color)
 			    * ((color->blue >> 8) - (cells[x].blue >> 8))));
 	  if (trial_delta < nearest_delta)
 	    {
-	      nearest = x;
-	      nearest_delta = trial_delta;
+	      /* We didn't decide to use this color, so free it.  */
+	      if (temp_allocated)
+		{
+		  XFreeColors (dpy, cmap, &temp.pixel, 1, 0);
+		  temp_allocated = false;
+		}
+
+	      temp.red = cells[x].red;
+	      temp.green = cells[x].green;
+	      temp.blue = cells[x].blue;
+	      status = XAllocColor (dpy, cmap, &temp);
+
+	      if (status)
+		{
+		  temp_allocated = true;
+		  nearest = x;
+		  nearest_delta = trial_delta;
+		}
 	    }
 	}
       color->red = cells[nearest].red;
       color->green = cells[nearest].green;
       color->blue = cells[nearest].blue;
-      status = XAllocColor (dpy, cmap, color);
 
-      if (status != 0 && !retry)
+      if (!temp_allocated)
+	status = XAllocColor (dpy, cmap, color);
+      else
+	{
+	  *color = temp;
+	  status = 1;
+	}
+
+      if (status == 0 && !retry)
 	{
 	  /* Our private cache of color cells is probably out of date.
 	     Refresh it here, and try to allocate the nearest color
-- 
2.39.2