xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 +++++
debian/patches/44_kdrive-ephyr-free-screen-struct.patch | 22 ++++++++++++++++
debian/patches/series | 1
3 files changed, 30 insertions(+)
New commits:
commit 1a512c89dc0e1fe0ce299cf30399c83e436485e3
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Mar 6 22:26:12 2007 +0100
kdrive/ephyr: free screen struct
Free screen->driver on screenFini, instead of just leaking it.
(upstream commit 0f6dd4aea6176507dbe1c90c950d332fecbcaacb)
diff --git a/debian/changelog b/debian/changelog
index 7d4681a..770df91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.1.1-20) unstable; urgency=low
+
+ * xephyr: Add patch from upstream git to fix memory leak in
+ ephyrScreenFini(). Thanks, Guillem Jover!
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 6 Mar 2007 22:20:14 +0100
+
xorg-server (2:1.1.1-19) unstable; urgency=high
[ Drew Parsons ]
diff --git a/debian/patches/44_kdrive-ephyr-free-screen-struct.patch b/debian/patches/44_kdrive-ephyr-free-screen-struct.patch
new file mode 100644
index 0000000..f905f7e
--- /dev/null
+++ b/debian/patches/44_kdrive-ephyr-free-screen-struct.patch
@@ -0,0 +1,22 @@
+From 0f6dd4aea6176507dbe1c90c950d332fecbcaacb Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniel@fooishbar.org>
+Date: Thu, 15 Feb 2007 16:14:57 +0200
+Subject: [PATCH] kdrive/ephyr: free screen struct
+Free screen->driver on screenFini, instead of just leaking it.
+---
+ hw/kdrive/ephyr/ephyr.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+Index: xorg-server/hw/kdrive/ephyr/ephyr.c
+===================================================================
+--- xorg-server.orig/hw/kdrive/ephyr/ephyr.c 2007-03-06 22:24:54.000000000 +0100
++++ xorg-server/hw/kdrive/ephyr/ephyr.c 2007-03-06 22:25:16.000000000 +0100
+@@ -667,6 +667,8 @@
+ void
+ ephyrScreenFini (KdScreenInfo *screen)
+ {
++ xfree(screen->driver);
++ screen->driver = NULL;
+ }
+
+ /*
diff --git a/debian/patches/series b/debian/patches/series
index 2e0c8ab..2580fe0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,3 +39,4 @@
41_xfree86_linux_acpi_fix_tokenizing.diff
42_build_int10_submodules.diff
43_fedora-xephyr-keysym-madness.diff
+44_kdrive-ephyr-free-screen-struct.patch
Reply to: