xscreensaver

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

  1. fix-tube-memleak
  2. Merge into ubuntu
Proposed by Chris Halse Rogers
Status: Merged
Merged at revision: 25
Proposed branch: lp:~raof/xscreensaver/fix-tube-memleak
Merge into: lp:~ubuntu-desktop/xscreensaver/ubuntu
Diff against target: 50 lines (+23/-1)
3 files modified
debian/changelog (+6/-1)
debian/patches/61_fix_tube_memleak.patch (+16/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~raof/xscreensaver/fix-tube-memleak
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+52375@code.launchpad.net

Commit message

Fix per-frame memleak in (at least) gltext

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1xscreensaver (5.12-0ubuntu4) UNRELEASED; urgency=low1xscreensaver (5.12-0ubuntu4) UNRELEASED; urgency=low
22
3 [ Robert Ancell ]
3 * Clean debian/patches4 * Clean debian/patches
4 * debian/control:5 * debian/control:
5 - Use standards version 3.9.16 - Use standards version 3.9.1
67
7 -- Robert Ancell <robert.ancell@canonical.com> Thu, 27 Jan 2011 14:24:06 +10008 [ Christopher James Halse Rogers ]
9 * debian/patches/61_fix_tube_memleak.patch:
10 - Fix a large per-frame memleak in (at least) gltext.
11
12 -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 07 Mar 2011 18:44:03 +1100
813
9xscreensaver (5.12-0ubuntu3) natty; urgency=low14xscreensaver (5.12-0ubuntu3) natty; urgency=low
1015
1116
=== 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 @@
1Description: Fix obnoxious per-frame memleak in (at least) gltext
2Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
3Forwarded: Yes
4
5Index: xscreensaver-5.12/hacks/glx/tube.c
6===================================================================
7--- xscreensaver-5.12.orig/hacks/glx/tube.c 2011-03-07 18:31:54.322875242 +1100
8+++ xscreensaver-5.12/hacks/glx/tube.c 2011-03-07 18:38:59.758156110 +1100
9@@ -181,6 +181,7 @@
10 glDrawArrays ((wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN), 0, out);
11 }
12
13+ free(array);
14 return polys;
15 }
16
017
=== 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 @@
1414
1580_Makefile_in-clean-fix.patch1580_Makefile_in-clean-fix.patch
1660_sequential_glslideshow.patch1660_sequential_glslideshow.patch
1761_fix_tube_memleak.patch

Subscribers

People subscribed via source and target branches