From 58ff764d4111bfaa7360c57bc62dd620fbdce06f Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 1 Feb 2012 08:27:16 +0100 Subject: xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012 --- xkbcomp/symbols.c | 4 ---- xkbcomp/xkbscan.c | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'xkbcomp') diff --git a/xkbcomp/symbols.c b/xkbcomp/symbols.c index 625fe9676..5547999b5 100644 --- a/xkbcomp/symbols.c +++ b/xkbcomp/symbols.c @@ -40,10 +40,6 @@ #include "misc.h" #include "alias.h" -extern Atom tok_ONE_LEVEL; -extern Atom tok_TWO_LEVEL; -extern Atom tok_KEYPAD; - /***====================================================================***/ #define RepeatYes 1 diff --git a/xkbcomp/xkbscan.c b/xkbcomp/xkbscan.c index 814a1235c..22a034fd9 100644 --- a/xkbcomp/xkbscan.c +++ b/xkbcomp/xkbscan.c @@ -615,16 +615,16 @@ yyGetNumber(int ch) nInBuf = 1; while (((ch = scanchar()) != EOF) && (isxdigit(ch) || ((nInBuf == 1) && (ch == 'x'))) - && nInBuf < nMaxBuffSize) + && nInBuf < (nMaxBuffSize - 1)) { buf[nInBuf++] = ch; } - if (ch == '.') + if ((ch == '.') && (nInBuf < (nMaxBuffSize - 1))) { isFloat = 1; buf[nInBuf++] = ch; while (((ch = scanchar()) != EOF) && (isxdigit(ch)) - && nInBuf < nMaxBuffSize) + && nInBuf < (nMaxBuffSize - 1)) { buf[nInBuf++] = ch; } -- cgit v1.2.3