From d245a951f39fe480c6268dbcc1fa06d59c40109e Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 16 Nov 2009 14:56:07 -0800
Subject: progs/demos: Fix memory leak in fslight.c. (cherry picked from commit
 aef3218f0bb48fdb286d2008ee07e507ea8aa98e)

---
 progs/demos/fslight.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/demos')

diff --git a/progs/demos/fslight.c b/progs/demos/fslight.c
index f0d76a4a06..acba3e9583 100644
--- a/progs/demos/fslight.c
+++ b/progs/demos/fslight.c
@@ -353,6 +353,7 @@ MakeSphere(void)
    glNewList(SphereList, GL_COMPILE);
    gluSphere(obj, 2.0f, 10, 5);
    glEndList();
+   gluDeleteQuadric(obj);
 }
 
 static void
-- 
cgit v1.2.3


From fc5f07de1aabddaf2c9d599a85ec74cde674275e Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 16 Nov 2009 15:44:52 -0800
Subject: progs/demos: Fix memory leak in ipers.c. (cherry picked from commit
 a1afe303deda320aadacdaf5b1c72631ca3f734f)

---
 progs/demos/ipers.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'progs/demos')

diff --git a/progs/demos/ipers.c b/progs/demos/ipers.c
index 5d82b0dc92..ed03673cb6 100644
--- a/progs/demos/ipers.c
+++ b/progs/demos/ipers.c
@@ -133,6 +133,8 @@ initdlists(void)
 
       glEndList();
    }
+
+   gluDeleteQuadric(obj);
 }
 
 static void
-- 
cgit v1.2.3


From 5820dae4ecad11097ddc024441ea45aa9fefa290 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 16 Nov 2009 16:31:34 -0800
Subject: progs/demos: Fix memory leak in projtex.c. (cherry picked from commit
 ee555e3d69c8820f27e71e5ebc028a768cef7d0b)

---
 progs/demos/projtex.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'progs/demos')

diff --git a/progs/demos/projtex.c b/progs/demos/projtex.c
index 99154d7bdc..ad205c7413 100644
--- a/progs/demos/projtex.c
+++ b/progs/demos/projtex.c
@@ -245,6 +245,9 @@ loadImageTextures(void)
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
      }
      glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, borderColor);
+
+     free(texData3);
+     free(texData4);
   }
 }
 
-- 
cgit v1.2.3


From b803abbaad3135047b931c322300b2d12ff255e1 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 16 Nov 2009 18:06:40 -0800
Subject: progs/demos: Fix memory leak in ray.c. (cherry picked from commit
 6b480dc21dd489d48685b2268e495218aea74293)

---
 progs/demos/ray.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'progs/demos')

diff --git a/progs/demos/ray.c b/progs/demos/ray.c
index c2d8e4f545..e9211aa339 100644
--- a/progs/demos/ray.c
+++ b/progs/demos/ray.c
@@ -834,6 +834,8 @@ initdlists(void)
    gluQuadricTexture(obj, GL_TRUE);
    gluSphere(obj, SPHERE_RADIUS, 16, 16);
    glEndList();
+
+   gluDeleteQuadric(obj);
 }
 
 int
-- 
cgit v1.2.3


From 7d84169865f5907a02ff2283ca7bd45a3bb2f3c9 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 7 Dec 2009 12:31:08 -0800
Subject: progs/demos: Fix memory leak in projtex.c.

---
 progs/demos/projtex.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'progs/demos')

diff --git a/progs/demos/projtex.c b/progs/demos/projtex.c
index ad205c7413..503cf5de08 100644
--- a/progs/demos/projtex.c
+++ b/progs/demos/projtex.c
@@ -248,6 +248,7 @@ loadImageTextures(void)
 
      free(texData3);
      free(texData4);
+     free(image);
   }
 }
 
-- 
cgit v1.2.3