Fix a small memory leak in __driUtilCreateScreen()

PR:		ports/51580
Submitted by:	Alexey Dokuchaev <danfe@regency.nsu.ru>
This commit is contained in:
Eric Anholt 2003-04-30 00:16:01 +00:00
parent ff8b37ce7a
commit 916ce7b9c6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=79898
4 changed files with 54 additions and 2 deletions

View file

@ -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/}

View file

@ -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));

View file

@ -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/}

View file

@ -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));