diff options
| author | Tobias Junghans <tobydox@veyon.io> | 2018-11-05 15:15:57 +0100 |
|---|---|---|
| committer | Tobias Junghans <tobydox@veyon.io> | 2018-11-05 15:15:57 +0100 |
| commit | c422847e2c5f32ed9531c461650c7f627516d951 (patch) | |
| tree | 7ecf5618ac7f46f5e0d703ddd2e634c261ddafa9 | |
| parent | ca2a5ac02fbbadd0a21fabba779c1ea69173d10b (diff) | |
| download | libtdevnc-c422847e2c5f32ed9531c461650c7f627516d951.tar.gz libtdevnc-c422847e2c5f32ed9531c461650c7f627516d951.zip | |
LibVNCClient: fix integer shifts for cursor colors
Shifting values > 32768 by 16 places can cause undefined results for
signed integers. Therefore cast color components to unsigned integer
before shifting.
| -rw-r--r-- | libvncserver/cursor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libvncserver/cursor.c b/libvncserver/cursor.c index c071dd9..8779470 100644 --- a/libvncserver/cursor.c +++ b/libvncserver/cursor.c @@ -456,10 +456,10 @@ void rfbMakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor fore+=4-bpp; } - background=cursor->backRed<<format->redShift| - cursor->backGreen<<format->greenShift|cursor->backBlue<<format->blueShift; - foreground=cursor->foreRed<<format->redShift| - cursor->foreGreen<<format->greenShift|cursor->foreBlue<<format->blueShift; + background=(uint32_t)cursor->backRed<<format->redShift| + (uint32_t)cursor->backGreen<<format->greenShift|(uint32_t)cursor->backBlue<<format->blueShift; + foreground=(uint32_t)cursor->foreRed<<format->redShift| + (uint32_t)cursor->foreGreen<<format->greenShift|(uint32_t)cursor->foreBlue<<format->blueShift; for(j=0;j<cursor->height;j++) for(i=0,bit=0x80;i<cursor->width;i++,bit=(bit&1)?0x80:bit>>1,cp+=bpp) |