Merge remote-tracking branch 'origin/released'

* origin/released:
  xserver randrproto libxtrans fontconfig libxcb xcb-proto mesa git update 26 Jan 2014

Conflicts:
	X11/xtrans/Xtrans.c
	xorg-server/dix/dispatch.c
	xorg-server/os/xdmcp.c

3 files changed, 12 insertions, 11 deletions

diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index dbaaee907..a6dce911a 100755
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -264,12 +264,11 @@ SmartScheduleClient(int *clientReady, int nready)
     for (i = 0; i < nready; i++) {

         client = clientReady[i];

         pClient = clients[client];

-        /* Praise clients which are idle */

-        if ((now - pClient->smart_check_tick) >= idle) {

+        /* Praise clients which haven't run in a while */

+        if ((now - pClient->smart_stop_tick) >= idle) {

             if (pClient->smart_priority < 0)

                 pClient->smart_priority++;

         }

-        pClient->smart_check_tick = now;

 

         /* check priority to select best client */

         robin =

@@ -3467,7 +3466,6 @@ InitClient(ClientPtr client, int i, void *ospriv)
     QueryMinMaxKeyCodes(&client->minKC, &client->maxKC);

     client->smart_start_tick = SmartScheduleTime;

     client->smart_stop_tick = SmartScheduleTime;

-    client->smart_check_tick = SmartScheduleTime;

     client->clientIds = NULL;

 }

 

diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index 3c3febdc5..74d05f95b 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -3965,6 +3965,8 @@ CheckPassiveGrabsOnWindow(WindowPtr pWin,
         return NULL;
 
     tempGrab = AllocGrab(NULL);
+    if (tempGrab == NULL)
+        return NULL;
 
     /* Fill out the grab details, but leave the type for later before
      * comparing */
@@ -5061,7 +5063,7 @@ ProcUngrabPointer(ClientPtr client)
  * @param other_mode GrabModeSync or GrabModeAsync
  * @param status Return code to be returned to the caller.
  *
- * @returns Success or BadValue.
+ * @returns Success or BadValue or BadAlloc.
  */
 int
 GrabDevice(ClientPtr client, DeviceIntPtr dev,
@@ -5142,6 +5144,8 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev,
         GrabPtr tempGrab;
 
         tempGrab = AllocGrab(NULL);
+        if (tempGrab == NULL)
+            return BadAlloc;
 
         tempGrab->next = NULL;
         tempGrab->window = pWin;
diff --git a/xorg-server/dix/grabs.c b/xorg-server/dix/grabs.c
index 5fd68202a..e3fc38bf5 100644
--- a/xorg-server/dix/grabs.c
+++ b/xorg-server/dix/grabs.c
@@ -199,12 +199,11 @@ AllocGrab(const GrabPtr src)
             free(grab);
             grab = NULL;
         }
-    }
-
-    if (src && !CopyGrab(grab, src)) {
-        free(grab->xi2mask);
-        free(grab);
-        grab = NULL;
+        else if (src && !CopyGrab(grab, src)) {
+            free(grab->xi2mask);
+            free(grab);
+            grab = NULL;
+        }
     }
 
     return grab;