From ec454c5976e20efe447dd3fac225aaaeb446c116 Mon Sep 17 00:00:00 2001
From: Packit <packit>
Date: Sep 14 2020 12:40:27 +0000
Subject: Apply patch 0001-IceListenForWellKnownConnections-Fix-memleak.patch


patch_name: 0001-IceListenForWellKnownConnections-Fix-memleak.patch
present_in_specfile: true

---

diff --git a/src/listenwk.c b/src/listenwk.c
index 7517ea8..9ff26da 100644
--- a/src/listenwk.c
+++ b/src/listenwk.c
@@ -61,6 +61,7 @@ IceListenForWellKnownConnections (
         strncpy (errorStringRet,
 	    "Cannot establish any listening sockets", errorLength);
 
+	free (transConns);
 	return (0);
     }
 
diff --git a/src/listenwk.c.IceListenForWellKnownConnections-memleak b/src/listenwk.c.IceListenForWellKnownConnections-memleak
new file mode 100644
index 0000000..7517ea8
--- /dev/null
+++ b/src/listenwk.c.IceListenForWellKnownConnections-memleak
@@ -0,0 +1,156 @@
+/*
+
+Copyright 1996, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+
+/* Author: Ralph Mor, X Consortium */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/ICE/ICElib.h>
+#include "ICElibint.h"
+#include <X11/Xtrans/Xtrans.h>
+#include <stdio.h>
+
+
+Status
+IceListenForWellKnownConnections (
+	char		*port,
+	int		*countRet,
+	IceListenObj	**listenObjsRet,
+	int		errorLength,
+	char		*errorStringRet
+)
+{
+    struct _IceListenObj	*listenObjs;
+    char			*networkId;
+    int				transCount, partial, i, j;
+    Status			status = 1;
+    XtransConnInfo		*transConns = NULL;
+
+
+    if ((_IceTransMakeAllCOTSServerListeners (port, &partial,
+	&transCount, &transConns) < 0) || (transCount < 1))
+    {
+	*listenObjsRet = NULL;
+	*countRet = 0;
+
+        strncpy (errorStringRet,
+	    "Cannot establish any listening sockets", errorLength);
+
+	return (0);
+    }
+
+    if ((listenObjs = malloc (transCount * sizeof (struct _IceListenObj))) == NULL)
+    {
+	for (i = 0; i < transCount; i++)
+	    _IceTransClose (transConns[i]);
+	free (transConns);
+	return (0);
+    }
+
+    *countRet = 0;
+
+    for (i = 0; i < transCount; i++)
+    {
+	networkId = (char *)_IceTransGetMyNetworkId (transConns[i]);
+
+	if (networkId)
+	{
+	    listenObjs[*countRet].trans_conn = transConns[i];
+	    listenObjs[*countRet].network_id = networkId;
+
+	    (*countRet)++;
+	}
+    }
+
+    if (*countRet == 0)
+    {
+	*listenObjsRet = NULL;
+
+        strncpy (errorStringRet,
+	    "Cannot establish any listening sockets", errorLength);
+
+	status = 0;
+    }
+    else
+    {
+	*listenObjsRet = malloc (*countRet * sizeof (IceListenObj));
+
+	if (*listenObjsRet == NULL)
+	{
+	    strncpy (errorStringRet, "Malloc failed", errorLength);
+
+	    status = 0;
+	}
+	else
+	{
+	    for (i = 0; i < *countRet; i++)
+	    {
+		(*listenObjsRet)[i] = malloc (sizeof (struct _IceListenObj));
+
+		if ((*listenObjsRet)[i] == NULL)
+		{
+		    strncpy (errorStringRet, "Malloc failed", errorLength);
+
+		    for (j = 0; j < i; j++)
+			free ((*listenObjsRet)[j]);
+
+		    free (*listenObjsRet);
+		    *listenObjsRet = NULL;
+
+		    status = 0;
+		    break;
+		}
+		else
+		{
+		    *((*listenObjsRet)[i]) = listenObjs[i];
+		}
+	    }
+	}
+    }
+
+    if (status == 1)
+    {
+	if (errorStringRet && errorLength > 0)
+	    *errorStringRet = '\0';
+
+	for (i = 0; i < *countRet; i++)
+	{
+	    (*listenObjsRet)[i]->host_based_auth_proc = NULL;
+	}
+    }
+    else
+    {
+	for (i = 0; i < transCount; i++)
+	    _IceTransClose (transConns[i]);
+    }
+
+    free (listenObjs);
+    free (transConns);
+
+    return (status);
+}