[PULL 1.15] First set of 1.15 fixes

[Peter Hutterer]

Not sure if you still want to be the stable maintainer, but if so: here's
your first set of cherry-picks. Mostly general cleanups that I found ont he
branch, Carlos' patch fixes a crash with some tablet devices under GNOME,
and the button state check is a mild security bug.

The following changes since commit 2ea973e12f5d954211e1d10085a4c74581b43aca:

  Bump version to 1.15.0 (2013-12-27 09:50:55 -0800)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver server-1.15-branch

for you to fetch changes up to f41ab8c60780ea8f87354e536e5b73cb23878eb7:

  dix: prevent a driver from initializing or submitting buttons > MAX_BUTTONS (2014-02-19 10:25:00 +1000)

----------------------------------------------------------------
Alan Coopersmith (3):
      Check for calloc() failure in add_master()
      On realloc failure, free font_path_string instead of leaking it
      xf86DeleteScreen: move check for NULL pScrn before first dereference

Carlos Garnacho (1):
      Xi: Ensure DeviceChanged is emitted after grabs are deactivated

Peter Hutterer (4):
      dix: fix button state check before changing a button mapping
      os: restrict display names to digits
      Xi: fix modifier offset in XIPassiveGrab swapping function
      dix: prevent a driver from initializing or submitting buttons > MAX_BUTTONS

 Xi/exevents.c                           | 19 ++++++++++++++++++-
 Xi/xichangehierarchy.c                  |  4 ++++
 Xi/xipassivegrab.c                      |  2 +-
 dix/devices.c                           |  1 +
 dix/dixfonts.c                          |  9 ++++++---
 dix/getevents.c                         |  2 ++
 dix/inpututils.c                        |  3 ++-
 hw/xfree86/common/xf86Helper.c          |  7 ++++---
 os/utils.c                              | 27 +++++++++++++++++++++++++++
 test/xi2/protocol-xipassivegrabdevice.c |  9 ++++++++-
 10 files changed, 73 insertions(+), 10 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140219/2a539500/attachment.pgp>