diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-15 08:16:33 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-15 08:16:33 +0100 |
| commit | 6f6a2340d40759b77ef43965efdd24f3e4e623fd (patch) | |
| tree | eb25fb9622df69a72ee33e655617a1127780cb90 /xorg-server/os | |
| parent | b41f74438672dd682bc01ae818cb3da654f22c1e (diff) | |
| download | vcxsrv-6f6a2340d40759b77ef43965efdd24f3e4e623fd.tar.gz vcxsrv-6f6a2340d40759b77ef43965efdd24f3e4e623fd.tar.bz2 vcxsrv-6f6a2340d40759b77ef43965efdd24f3e4e623fd.zip | |
libxcb mesa xserver xkeyboard-config git update 15 Feb 2013
xserver commit 90642948cc78834d95f7a3bddaac7ff77b68ed7e
libxcb commit 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13
xkeyboard-config commit 067b0e4fd8d4fe707d86b24ae83bcacb61624231
mesa commit 6dbe94c12cd1b3b912a7083055178e0dfd7372af
Diffstat (limited to 'xorg-server/os')
| -rw-r--r-- | xorg-server/os/log.c | 3 | ||||
| -rw-r--r-- | xorg-server/os/strndup.c | 4 |
2 files changed, 7 insertions, 0 deletions
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> |