[patch] xorg-server-1.14.3-CVE-2013-4396.patch

xorg-server-1.14.3-CVE-2013-4396.patch (text/plain), 1.18 KB, created by Lars Wendler (Polynomial-C) (RETIRED) on 2013-10-10 15:01:22 UTC

--- xorg-server-1.14.3/dix/dixfonts.c
+++ xorg-server-1.14.3/dix/dixfonts.c
@@ -1425,6 +1425,7 @@
             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
@@ -1436,12 +1437,14 @@
                 err = BadAlloc;
                 goto bail;
             }
+            old_closure = c;
             *new_closure = *c;
             c = new_closure;
 
             data = malloc(c->nChars * itemSize);
             if (!data) {
                 free(c);
+                c = old_closure;
                 err = BadAlloc;
                 goto bail;
             }
@@ -1452,6 +1455,7 @@
             if (!pGC) {
                 free(c->data);
                 free(c);
+                c = old_closure;
                 err = BadAlloc;
                 goto bail;
             }
@@ -1464,6 +1468,7 @@
                 FreeScratchGC(pGC);
                 free(c->data);
                 free(c);
+                c = old_closure;
                 err = BadAlloc;
                 goto bail;
             }