nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for undefined behaviour on signed shift (#3453) 

Fixes for undefined behaviour on signed shift

Change literal 1 to unsigned to allow safe bitshift of 31.
Caught by cppcheck.

Make 0xFF unsigned to prevent a left shift into signed bit.
Spotted by @orestisf1993
This commit is contained in:
Alan Barr 2018-10-13 19:04:40 +01:00 committed by Orestis
parent dfe89cc4f1
commit 7c0994dafc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i3bar/src/ipc.c
View File

@ -278,8 +278,8 @@ void got_data(struct ev_loop *loop, ev_io *watcher, int events) {
buffer[size] = '\0'; buffer[size] = '\0';
/* And call the callback (indexed by the type) */ /* And call the callback (indexed by the type) */
if (type & (1 << 31)) { if (type & (1UL << 31)) {
type ^= 1 << 31; type ^= 1UL << 31;
event_handlers[type](buffer); event_handlers[type](buffer);
} else { } else {
if (reply_handlers[type]) if (reply_handlers[type])

2
include/i3/ipc.h
View File

@ -87,7 +87,7 @@ typedef struct i3_ipc_header {
* Events from i3 to clients. Events have the first bit set high. * Events from i3 to clients. Events have the first bit set high.
* *
*/ */
#define I3_IPC_EVENT_MASK (1 << 31) #define I3_IPC_EVENT_MASK (1UL << 31)
/* The workspace event will be triggered upon changes in the workspace list */ /* The workspace event will be triggered upon changes in the workspace list */
#define I3_IPC_EVENT_WORKSPACE (I3_IPC_EVENT_MASK | 0) #define I3_IPC_EVENT_WORKSPACE (I3_IPC_EVENT_MASK | 0)

2
libi3/get_colorpixel.c
View File

@ -43,7 +43,7 @@ uint32_t get_colorpixel(const char *hex) {
/* Shortcut: if our screen is true color, no need to do a roundtrip to X11 */ /* Shortcut: if our screen is true color, no need to do a roundtrip to X11 */
if (root_screen == NULL || root_screen->root_depth == 24 || root_screen->root_depth == 32) { if (root_screen == NULL || root_screen->root_depth == 24 || root_screen->root_depth == 32) {
return (0xFF << 24) | (r << 16 | g << 8 | b); return (0xFFUL << 24) | (r << 16 | g << 8 | b);
} }
/* Lookup this colorpixel in the cache */ /* Lookup this colorpixel in the cache */