Merge lp:~raof/xscreensaver/fix-tube-memleak into lp:~ubuntu-desktop/xscreensaver/ubuntu

[Chris Halse Rogers]

Fix per-frame memleak in (at least) gltext

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-27 04:24:38 +0000
+++ debian/changelog	2011-03-07 08:00:49 +0000
@@ -1,10 +1,15 @@
 xscreensaver (5.12-0ubuntu4) UNRELEASED; urgency=low
 
+  [ Robert Ancell ]
   * Clean debian/patches
   * debian/control:
     - Use standards version 3.9.1
 
- -- Robert Ancell <[e-mail]>  Thu, 27 Jan 2011 14:24:06 +1000
+  [ Christopher James Halse Rogers ]
+  * debian/patches/61_fix_tube_memleak.patch:
+    - Fix a large per-frame memleak in (at least) gltext.
+
+ -- Christopher James Halse Rogers <[e-mail]>  Mon, 07 Mar 2011 18:44:03 +1100
 
 xscreensaver (5.12-0ubuntu3) natty; urgency=low
 

=== added file 'debian/patches/61_fix_tube_memleak.patch'
--- debian/patches/61_fix_tube_memleak.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/61_fix_tube_memleak.patch	2011-03-07 08:00:49 +0000
@@ -0,0 +1,16 @@
+Description: Fix obnoxious per-frame memleak in (at least) gltext
+Author: Christopher James Halse Rogers <[e-mail]>
+Forwarded: Yes
+
+Index: xscreensaver-5.12/hacks/glx/tube.c
+===================================================================
+--- xscreensaver-5.12.orig/hacks/glx/tube.c	2011-03-07 18:31:54.322875242 +1100
++++ xscreensaver-5.12/hacks/glx/tube.c	2011-03-07 18:38:59.758156110 +1100
+@@ -181,6 +181,7 @@
+         glDrawArrays ((wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN), 0, out);
+       }
+ 
++  free(array);
+   return polys;
+ }
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-01-21 18:32:24 +0000
+++ debian/patches/series	2011-03-07 08:00:49 +0000
@@ -14,3 +14,4 @@
 
 80_Makefile_in-clean-fix.patch
 60_sequential_glslideshow.patch
+61_fix_tube_memleak.patch