diff options
| author | Vinson Lee <vlee@vmware.com> | 2009-12-12 21:46:13 -0800 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2011-07-11 20:05:25 +0100 |
| commit | 35156409dc5be0d93db95f570d9f3c0b2bce074b (patch) | |
| tree | b840b27fd41a5bdd50be60e904ae1071dcb3f9d0 | |
| parent | 92a4de30887d58ddd072a110ca839e10ace18b89 (diff) | |
| download | glut-35156409dc5be0d93db95f570d9f3c0b2bce074b.tar.gz | |
glut: Prevent potential double free in menuVisualSetup.
| -rw-r--r-- | src/glut/glx/glut_menu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/glut/glx/glut_menu.c b/src/glut/glx/glut_menu.c index 4c4a5ae..d136823 100644 --- a/src/glut/glx/glut_menu.c +++ b/src/glut/glx/glut_menu.c @@ -225,6 +225,7 @@ menuVisualSetup(void) if (!status) { XFreeColormap(__glutDisplay, menuColormap); free(placeHolders); + placeHolders = NULL; continue; } } @@ -241,6 +242,7 @@ menuVisualSetup(void) XFreeColormap(__glutDisplay, menuColormap); if (placeHolders) { free(placeHolders); + placeHolders = NULL; } continue; } @@ -252,6 +254,7 @@ menuVisualSetup(void) XFreeColormap(__glutDisplay, menuColormap); if (placeHolders) { free(placeHolders); + placeHolders = NULL; } continue; } @@ -263,6 +266,7 @@ menuVisualSetup(void) XFreeColormap(__glutDisplay, menuColormap); if (placeHolders) { free(placeHolders); + placeHolders = NULL; } continue; } @@ -271,6 +275,7 @@ menuVisualSetup(void) XFreeColors(__glutDisplay, menuColormap, placeHolders, numPlaceHolders, 0); free(placeHolders); + placeHolders = NULL; } menuWhite = color.pixel; menuVisual = visual->vinfo.visual; |