aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os/log.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-15 08:22:54 +0100
committermarha <marha@users.sourceforge.net>2013-02-15 08:22:54 +0100
commit0b2fa092281e667dbb02942008b16510af1086ef (patch)
tree350352f14a2a6f98d2f5a5356eb63aeae67d6047 /xorg-server/os/log.c
parent1de47a7fc53a67beccab830178aaa0118ed4734f (diff)
parent6f6a2340d40759b77ef43965efdd24f3e4e623fd (diff)
downloadvcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.tar.gz
vcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.tar.bz2
vcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libxcb mesa xserver xkeyboard-config git update 15 Feb 2013
Diffstat (limited to 'xorg-server/os/log.c')
-rw-r--r--xorg-server/os/log.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index a65b03c66..4f37da2ad 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -310,6 +310,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*);