Skip to content

N
nx-libs
Commit 0f8dbbab authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

Screen.c: correctly free stuff in nxagentCloseScreen

fixes a memory leak: ==19074== 2 bytes in 1 blocks are definitely lost in loss record 8 of 313 ==19074== at 0x483577F: malloc (vg_replace_malloc.c:299) ==19074== by 0x1FD83D: fbAllocatePrivates (fballpriv.c:79) ==19074== by 0x20A666: fbSetupScreen (fbscreen.c:110) ==19074== by 0x20A666: fbScreenInit (fbscreen.c:300) ==19074== by 0x1DEA4C: nxagentOpenScreen (Screen.c:1356) ==19074== by 0x16D7F8: AddScreen (dispatch.c:4257) ==19074== by 0x1DA0CF: InitOutput (Init.c:397) ==19074== by 0x14DCC2: main (main.c:280)
parent 308824ba
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 3 deletions
nx-X11/programs/Xserver/hw/nxagent/Screen.c
View file @ 0f8dbbab
......@@ -2141,20 +2141,32 @@ Bool nxagentCloseScreen(ScreenPtr pScreen)
fprintf(stderr, "running nxagentCloseScreen()\n");
#endif
/*
* We have called fbScreenInit() in nxagenOpenScreen, which in turn
* called fbOpenScreen. But we are not using the data as created by
* fbOpenScreen but have freed it and replaced by our own. So we free
* our own stuff here and take care that fbCloseScreen will not free
* them again.
*/
for (i = 0; i < pScreen->numDepths; i++)
{
free(pScreen->allowedDepths[i].vids);
pScreen->allowedDepths[i].vids = NULL;
}
pScreen->numDepths = 0;
/*
* Free the frame buffer.
*/
free(((PixmapPtr)pScreen -> devPrivate) -> devPrivate.ptr);
free(pScreen->devPrivate);pScreen->devPrivate = NULL;
free(pScreen->allowedDepths); pScreen->allowedDepths = NULL;
free(pScreen->visuals); pScreen->visuals = NULL;
free(pScreen->allowedDepths);
free(pScreen->visuals);
free(pScreen->devPrivate);
fbCloseScreen(pScreen);
/*
* Reset the geometry and alpha information
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment