merge ^/branches/released .

1 files changed, 28 insertions, 0 deletions

diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c
index b61cf4831..743e6208d 100644
--- a/xorg-server/dix/inpututils.c
+++ b/xorg-server/dix/inpututils.c
@@ -36,6 +36,7 @@
 #include "xkbsrv.h"

 #include "xkbstr.h"

 #include "inpututils.h"

+#include "eventstr.h"

 

 /* Check if a button map change is okay with the device.

  * Returns -1 for BadValue, as it collides with MappingBusy. */

@@ -556,3 +557,30 @@ CountBits(const uint8_t *mask, int len)
 

     return ret;

 }

+

+/**

+ * Verifies sanity of the event. If the event is not an internal event,

+ * memdumps the first 32 bytes of event to the log, a backtrace, then kill

+ * the server.

+ */

+void verify_internal_event(const InternalEvent *ev)

+{

+    if (ev && ev->any.header != ET_Internal)

+    {

+        int i;

+        unsigned char *data = (unsigned char*)ev;

+

+        ErrorF("dix: invalid event type %d\n", ev->any.header);

+

+        for (i = 0; i < sizeof(xEvent); i++, data++)

+        {

+            ErrorF("%02hx ", *data);

+

+            if ((i % 8) == 7)

+                ErrorF("\n");

+        }

+

+        xorg_backtrace();

+        FatalError("Wrong event type %d. Aborting server\n", ev->any.header);

+    }

+}