← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xorg-server/quantal-updates

« back to all changes in this revision

Viewing changes to debian/patches/608-dix-fix-an-out-of-memory-crash.patch

  • Committer: Package Import Robot
  • Author(s): Chase Douglas
  • Date: 2012-03-07 15:36:20 UTC
  • Revision ID: package-import@ubuntu.com-20120307153620-v2789zwz1n3irs3b
Tags: 2:1.11.4-0ubuntu5
https://launchpad.net/bugs/929408
* Update to 1.12 input stack 
* Drop input patches that have been merged upstream:
  - 600-Revert-dix-deduplicate-callers-of-DeliverDeviceEvent.patch
  - 601-Store-window-pointer-in-touch-listener-record.patch
  - 602-Factor-out-TouchEnd-generation-and-delivery.patch
  - 603-Export-TouchEventRejected-as-TouchRejected.patch
  - 604-Move-AllowTouch-to-dix-touch.c-and-rename-to-TouchAc.patch
  - 605-Check-for-proper-window-ID-when-processing-touch-all.patch
  - 606-Implement-early-touch-reject.patch
  - 607-Implement-touch-early-accept.patch
  - 608-dix-fix-an-out-of-memory-crash.patch
  - 609-Xi-handle-new-XIAllowEvents-request-in-inputproto-2..patch
  - 610-Fix-scrolling.patch
  - 611-Fix-touch-punt-crash.patch
  - 612-Fix-vcp-touches-corruption.patch
  - 613-Keep-vcp-touch-class.patch
* Fix indirect touch grab handling (LP: #929408)
  - Add temporary patch 501_touch_accept_end.patch
  - Add temporary patch 502_indirect_touch_window_set.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/608-dix-fix-an-out-of-memory-crash.patch
1
 
From b96275c4cdb164aa71f7aa9fbf88be18886d1936 Mon Sep 17 00:00:00 2001
2
 
From: Benjamin Otte <otte@redhat.com>
3
 
Date: Tue, 7 Feb 2012 18:01:25 +1000
4
 
Subject: [PATCH] dix: fix an out-of-memory crash
5
 
 
6
 
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
7
 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
8
 
---
9
 
 dix/inpututils.c |    3 +++
10
 
 1 files changed, 3 insertions(+), 0 deletions(-)
11
 
 
12
 
diff --git a/dix/inpututils.c b/dix/inpututils.c
13
 
index d279c1d..9e0c551 100644
14
 
--- a/dix/inpututils.c
15
 
+++ b/dix/inpututils.c
16
 
@@ -432,6 +432,9 @@ valuator_mask_new(int num_valuators)
17
 
      * flying-car future, when we can dynamically alloc the masks and are
18
 
      * not constrained by signals, we can start using num_valuators */
19
 
     ValuatorMask *mask = calloc(1, sizeof(ValuatorMask));
20
 
+    if (mask == NULL)
21
 
+        return NULL;
22
 
+
23
 
     mask->last_bit = -1;
24
 
     return mask;
25
 
 }
26
 
1.7.8.3
27