Coverity nos. 868 and 869: Free the result of xf86GetEntityInfo.

This commit is contained in:
Aaron Plattner
2006-03-10 02:29:03 +00:00
parent 61e237eec7
commit 84c007b426
3 changed files with 27 additions and 5 deletions

View File

@@ -1,3 +1,9 @@
2006-03-09 Aaron Plattner <aplattner@nvidia.com>
* src/nv_driver.c: (NVPreInit):
* src/riva_driver.c: (RivaPreInit):
Coverity nos. 868 and 869: Free the result of xf86GetEntityInfo.
2006-01-24 Aaron Plattner <aplattner@nvidia.com>
* src/nv_driver.c:

View File

@@ -1,4 +1,4 @@
/* $XdotOrg: driver/xf86-video-nv/src/nv_driver.c,v 1.20 2006/01/23 00:04:41 aplattner Exp $ */
/* $XdotOrg: driver/xf86-video-nv/src/nv_driver.c,v 1.21 2006/01/24 16:45:29 aplattner Exp $ */
/* $XConsortium: nv_driver.c /main/3 1996/10/28 05:13:37 kaleb $ */
/*
* Copyright 1996-1997 David J. McKay
@@ -983,8 +983,16 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
const char *s;
if (flags & PROBE_DETECT) {
nvProbeDDC( pScrn, xf86GetEntityInfo(pScrn->entityList[0])->index );
return TRUE;
EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
if (!pEnt)
return FALSE;
i = pEnt->index;
xfree(pEnt);
nvProbeDDC(pScrn, i);
return TRUE;
}
/*

View File

@@ -493,8 +493,16 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
const char *s;
if (flags & PROBE_DETECT) {
rivaProbeDDC( pScrn, xf86GetEntityInfo(pScrn->entityList[0])->index );
return TRUE;
EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
if (!pEnt)
return FALSE;
i = pEnt->index;
xfree(pEnt);
rivaProbeDDC(pScrn, i);
return TRUE;
}
/*