xorg-server: Changes to 'ubuntu'
debian/changelog | 9 +++++++++
debian/patches/213_xichangehierarchy-check-oom.patch | 13 +++++++++++++
debian/patches/series | 1 +
3 files changed, 23 insertions(+)
New commits:
commit 4163c9c7260ff850905ebeecf858c4f72af7d9df
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed Feb 16 16:59:34 2011 -0800
Add 213_xichangehierarchy-check-oom.patch: Another NULL pointer check for out-of-memory conditions, this time leading to a segfault in an unchecked calloc in XISendDeviceHierarchyEvent(). (LP: #720445)
diff --git a/debian/changelog b/debian/changelog
index 09158b6..418e6e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu5) natty; urgency=low
+
+ * Add 213_xichangehierarchy-check-oom.patch: Another NULL pointer check
+ for out-of-memory conditions, this time leading to a segfault in an
+ unchecked calloc in XISendDeviceHierarchyEvent().
+ (LP: #720445)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 16 Feb 2011 16:46:35 -0800
+
xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu4) natty; urgency=low
* Add 211_glx_fix_bindtextimageext_length_check.patch,
diff --git a/debian/patches/213_xichangehierarchy-check-oom.patch b/debian/patches/213_xichangehierarchy-check-oom.patch
new file mode 100644
index 0000000..d836233
--- /dev/null
+++ b/debian/patches/213_xichangehierarchy-check-oom.patch
@@ -0,0 +1,13 @@
+diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
+index b9cdedf..21c74ed 100644
+--- a/Xi/xichangehierarchy.c
++++ b/Xi/xichangehierarchy.c
+@@ -70,6 +70,8 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
+
+ ev = calloc(1, sizeof(xXIHierarchyEvent) +
+ MAXDEVICES * sizeof(xXIHierarchyInfo));
++ if (!ev)
++ return;
+ ev->type = GenericEvent;
+ ev->extension = IReqCode;
+ ev->evtype = XI_HierarchyChanged;
diff --git a/debian/patches/series b/debian/patches/series
index ba03507..1240c39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,4 @@
210_pixman_null_ptr_check.patch
211_glx_fix_bindtextimageext_length_check.patch
212_fix_request_length_check_for_createglxpbuffersgix.patch
+213_xichangehierarchy-check-oom.patch
Reply to: