diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-12-11 10:24:13 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-01-03 11:02:11 -0800 |
| commit | 299c9762b1dbe53f3297c54e5526aeae767d1a10 (patch) | |
| tree | 13cff7b6c398c528ec8b397d640aa3f43b25db42 /keycodes.c | |
| parent | e4cba31313b44e40efcc0c260a33c3ec83e4b772 (diff) | |
| download | xorg-app-xkbcomp-299c9762b1dbe53f3297c54e5526aeae767d1a10.tar.gz | |
Use unsigned ints when shifting to create bitmasks
symbols.c:1057:28: portability: Shifting signed 32-bit value by 31 bits
is implementation-defined behaviour. See condition at line 1049.
[shiftTooManyBitsSigned]
radio_groups |= (1 << (tmp.uval - 1));
^
symbols.c:1049:41: note: Assuming that condition 'tmp.uval>32' is not redundant
if ((tmp.uval < 1) || (tmp.uval > XkbMaxRadioGroups))
^
symbols.c:1057:28: note: Shift
radio_groups |= (1 << (tmp.uval - 1));
^
symbols.c:1057:28: warning: Either the condition 'tmp.uval>32' is redundant
or there is signed integer overflow for expression '1<<(tmp.uval-1)'.
[integerOverflowCond]
radio_groups |= (1 << (tmp.uval - 1));
^
symbols.c:1049:41: note: Assuming that condition 'tmp.uval>32' is not redundant
if ((tmp.uval < 1) || (tmp.uval > XkbMaxRadioGroups))
^
symbols.c:1057:28: note: Integer overflow
radio_groups |= (1 << (tmp.uval - 1));
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'keycodes.c')
| -rw-r--r-- | keycodes.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -880,8 +880,8 @@ CompileKeycodes(XkbFile * file, XkbFileInfo * result, unsigned merge) XkbAtomGetString(NULL, ii->name), False); if (xkb->indicators != NULL) { - unsigned bit; - bit = 1 << (ii->ndx - 1); + unsigned bit = 1U << (ii->ndx - 1); + if (ii->virtual) xkb->indicators->phys_indicators &= ~bit; else |