diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-01 08:36:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-01 08:36:02 +0100 |
| commit | 68320ff05946f092b6836754c6267b1dff2f4633 (patch) | |
| tree | 424d73f509dff521d4cc22a95369594b7ee56dad /xkbcomp | |
| parent | 71b5bea4d5ef75f50bd7bd7b93f47f8552c178e0 (diff) | |
| parent | 58ff764d4111bfaa7360c57bc62dd620fbdce06f (diff) | |
| download | vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.tar.gz vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.tar.bz2 vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/symbols.c | 4 | ||||
| -rw-r--r-- | xkbcomp/xkbscan.c | 6 |
2 files changed, 3 insertions, 7 deletions
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 2f7f7330e..4fb575536 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; } |