summaryrefslogtreecommitdiff
path: root/x11-servers/XFree86-4-Server-snap
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2003-04-30 00:16:01 +0000
committerEric Anholt <anholt@FreeBSD.org>2003-04-30 00:16:01 +0000
commit916ce7b9c6de2553ecd1500bf84dd128d779112c (patch)
tree2e30163d6bae08aec49422cd3467973de738a5e5 /x11-servers/XFree86-4-Server-snap
parentFix a small memory leak in XvQueryAdaptors() (diff)
Fix a small memory leak in __driUtilCreateScreen()
PR: ports/51580 Submitted by: Alexey Dokuchaev <danfe@regency.nsu.ru>
Notes
Notes: svn path=/head/; revision=79898
Diffstat (limited to 'x11-servers/XFree86-4-Server-snap')
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile2
-rw-r--r--x11-servers/XFree86-4-Server-snap/files/patch-dri_util.c26
2 files changed, 27 insertions, 1 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 119afd954171..50250b788738 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.3.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-dri_util.c b/x11-servers/XFree86-4-Server-snap/files/patch-dri_util.c
new file mode 100644
index 000000000000..0084acff7a3e
--- /dev/null
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-dri_util.c
@@ -0,0 +1,26 @@
+Index: lib/GL/dri/dri_util.c
+===================================================================
+RCS file: /home/ncvs/xfree/xc/lib/GL/dri/dri_util.c,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -u -r1.6 -r1.7
+--- lib/GL/dri/dri_util.c 15 Feb 2003 22:12:29 -0000 1.6
++++ lib/GL/dri/dri_util.c 28 Apr 2003 17:01:25 -0000 1.7
+@@ -921,7 +921,7 @@
+ int directCapable;
+ __DRIscreenPrivate *psp;
+ drmHandle hFB, hSAREA;
+- char *BusID, *driverName;
++ char *BusID, *driverName = NULL;
+ drmMagic magic;
+
+ if (!XF86DRIQueryDirectRenderingCapable(dpy, scrn, &directCapable)) {
+@@ -1010,6 +1010,8 @@
+ (void)XF86DRICloseConnection(dpy, scrn);
+ return NULL;
+ }
++ if (driverName)
++ Xfree(driverName);
+
+ /* install driver's callback functions */
+ memcpy(&psp->DriverAPI, driverAPI, sizeof(struct __DriverAPIRec));