From 6f6a2340d40759b77ef43965efdd24f3e4e623fd Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 15 Feb 2013 08:16:33 +0100
Subject: libxcb mesa xserver xkeyboard-config git update 15 Feb 2013

xserver          commit 90642948cc78834d95f7a3bddaac7ff77b68ed7e
libxcb           commit 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13
xkeyboard-config commit 067b0e4fd8d4fe707d86b24ae83bcacb61624231
mesa             commit 6dbe94c12cd1b3b912a7083055178e0dfd7372af
---
 xorg-server/os/log.c     | 3 +++
 xorg-server/os/strndup.c | 4 ++++
 2 files changed, 7 insertions(+)

(limited to 'xorg-server/os')

diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index 2697acec8..95bd8cca9 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -304,6 +304,9 @@ pnprintf(char *string, size_t size, const char *f, va_list args)
         while (f_idx < f_len && ((f[f_idx] >= '0' && f[f_idx] <= '9') || f[f_idx] == '.'))
             f_idx++;
 
+        if (f_idx >= f_len)
+            break;
+
         switch (f[f_idx]) {
         case 's':
             string_arg = va_arg(args, char*);
diff --git a/xorg-server/os/strndup.c b/xorg-server/os/strndup.c
index b604b9bac..e0eddf13d 100644
--- a/xorg-server/os/strndup.c
+++ b/xorg-server/os/strndup.c
@@ -27,6 +27,10 @@
  * SUCH DAMAGE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-- 
cgit v1.2.3