1 files changed, 0 insertions, 115 deletions
diff --git a/debian/patches/1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageT.full.patch b/debian/patches/1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageT.full.patch
deleted file mode 100644
index 63d23622d..000000000
--- a/debian/patches/1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageT.full.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 72790a55862f9a2232ba0cd7b072bbe3887cd820 Mon Sep 17 00:00:00 2001
-From: Mike DePaulo <mikedep333@gmail.com>
-Date: Sun, 8 Feb 2015 20:01:27 -0500
-Subject: [PATCH 03/40] Avoid use-after-free in dix/dixfonts.c: doImageText()
- [CVE-2013-4396] from xorg/Xserver
- http://lists.x.org/archives/xorg-announce/2013-October/002332.html
-
-Save a pointer to the passed in closure structure before copying it
-and overwriting the *c pointer to point to our copy instead of the
-original.  If we hit an error, once we free(c), reset c to point to
-the original structure before jumping to the cleanup code that
-references *c.
-
-Since one of the errors being checked for is whether the server was
-able to malloc(c->nChars * itemSize), the client can potentially pass
-a number of characters chosen to cause the malloc to fail and the
-error path to be taken, resulting in the read from freed memory.
-
-Since the memory is accessed almost immediately afterwards, and the
-X server is mostly single threaded, the odds of the free memory having
-invalid contents are low with most malloc implementations when not using
-memory debugging features, but some allocators will definitely overwrite
-the memory there, leading to a likely crash.
-
-v2: Apply to NXdixfonts.c rather than dixfonts.c (Mike DePaulo)
-v3: backport v2 to nx-libs 3.5.0.x (Mihai Moldovan)
-
----
- nx-X11/programs/Xserver/dix/dixfonts.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/nx-X11/programs/Xserver/dix/dixfonts.c
-+++ b/nx-X11/programs/Xserver/dix/dixfonts.c
-@@ -1559,6 +1559,7 @@ doImageText(ClientPtr client, register I
- 	    GC *pGC;
- 	    unsigned char *data;
- 	    ITclosurePtr new_closure;
-+	    ITclosurePtr old_closure;
- 
- 	    /* We're putting the client to sleep.  We need to
- 	       save some state.  Similar problem to that handled
-@@ -1571,6 +1572,7 @@ doImageText(ClientPtr client, register I
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-+	    old_closure = c;
- 	    *new_closure = *c;
- 	    c = new_closure;
- 
-@@ -1578,6 +1580,7 @@ doImageText(ClientPtr client, register I
- 	    if (!data)
- 	    {
- 		xfree(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-@@ -1589,6 +1592,7 @@ doImageText(ClientPtr client, register I
- 	    {
- 		xfree(c->data);
- 		xfree(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-@@ -1602,6 +1606,7 @@ doImageText(ClientPtr client, register I
- 		FreeScratchGC(pGC);
- 		xfree(c->data);
- 		xfree(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }
---- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
-@@ -1711,6 +1711,7 @@ doImageText(client, c)
- 	    GC *pGC;
- 	    unsigned char *data;
- 	    ITclosurePtr new_closure;
-+	    ITclosurePtr old_closure;
- 
- 	    /* We're putting the client to sleep.  We need to
- 	       save some state.  Similar problem to that handled
-@@ -1723,6 +1724,7 @@ doImageText(client, c)
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-+	    old_closure = c;
- 	    *new_closure = *c;
- 	    c = new_closure;
- 
-@@ -1730,6 +1732,7 @@ doImageText(client, c)
- 	    if (!data)
- 	    {
- 		xfree(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-@@ -1741,6 +1744,7 @@ doImageText(client, c)
- 	    {
- 		xfree(c->data);
- 		xfree(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }
-@@ -1759,6 +1763,7 @@ doImageText(client, c)
- 		FreeScratchGC(pGC);
- 		xfree(c->data);
- 		xfree(c);
-+		c = old_closure;
- 		err = BadAlloc;
- 		goto bail;
- 	    }