Don't free the device info on a failed PreInit.

This data is later freed when the xserver calls UnInit().
Freeing too early means we segfault later when trying to dereference
null-pointers.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 799bbf2cf9cd54942c66f9117df319e933bbd10b)

Conflicts:

	src/wcmConfig.c

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

1 files changed, 4 insertions, 10 deletions

diff --git a/src/wcmConfig.c b/src/wcmConfig.c
index 3c183f0..f8aac5a 100644
--- a/src/wcmConfig.c
+++ b/src/wcmConfig.c
@@ -444,17 +444,11 @@ SetupProc_fail:
 	/* restart the device list from the next one */
 	if (common && priv)
 		common->wcmDevices = priv->next;
-	free(common);
-	free(priv);
-	if (pInfo)
-	{
-		if (pInfo->fd != -1)
-		{
-			close(pInfo->fd);
-			pInfo->fd = -1;
-		}
 
-		pInfo->private = NULL;
+	if (pInfo && pInfo->fd != -1)
+	{
+		close(pInfo->fd);
+		pInfo->fd = -1;
 	}
 
 	return BadMatch;