diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-01-20 17:11:19 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-07-07 13:27:09 +0200 |
| commit | 8432ec16a1764ff57587e24ad9f6479484d350ec (patch) | |
| tree | bc2c2e5a6c7f54fd0a7555e8f8179c208d3ee9a0 /common/rfb | |
| parent | 2baf7023c0a629b615fb4f71d7b99212c8d08b4f (diff) | |
| download | tigervnc-8432ec16a1764ff57587e24ad9f6479484d350ec.tar.gz tigervnc-8432ec16a1764ff57587e24ad9f6479484d350ec.zip | |
Fix possible information leakage
Zero the padding byte used when converting 24-bit RGB to 32-bit.
Diffstat (limited to 'common/rfb')
| -rw-r--r-- | common/rfb/PixelFormat.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/common/rfb/PixelFormat.cxx b/common/rfb/PixelFormat.cxx index 2883f621..c70a1701 100644 --- a/common/rfb/PixelFormat.cxx +++ b/common/rfb/PixelFormat.cxx @@ -137,25 +137,29 @@ void PixelFormat::bufferFromRGB(rdr::U8 *dst, const rdr::U8* src, { if (is888()) { // Optimised common case - rdr::U8 *r, *g, *b; + rdr::U8 *r, *g, *b, *x; if (bigEndian) { r = dst + (24 - redShift)/8; g = dst + (24 - greenShift)/8; b = dst + (24 - blueShift)/8; + x = dst + (24 - (48 - redShift - greenShift - blueShift))/8; } else { r = dst + redShift/8; g = dst + greenShift/8; b = dst + blueShift/8; + x = dst + (48 - redShift - greenShift - blueShift)/8; } while (pixels--) { *r = *(src++); *g = *(src++); *b = *(src++); + *x = 0; r += 4; g += 4; b += 4; + x += 4; } } else { // Generic code @@ -180,16 +184,18 @@ void PixelFormat::bufferFromRGB(rdr::U8 *dst, const rdr::U8* src, { if (is888()) { // Optimised common case - rdr::U8 *r, *g, *b; + rdr::U8 *r, *g, *b, *x; if (bigEndian) { r = dst + (24 - redShift)/8; g = dst + (24 - greenShift)/8; b = dst + (24 - blueShift)/8; + x = dst + (24 - (48 - redShift - greenShift - blueShift))/8; } else { r = dst + redShift/8; g = dst + greenShift/8; b = dst + blueShift/8; + x = dst + (48 - redShift - greenShift - blueShift)/8; } int dstPad = pitch - w * 4; @@ -199,13 +205,16 @@ void PixelFormat::bufferFromRGB(rdr::U8 *dst, const rdr::U8* src, *r = *(src++); *g = *(src++); *b = *(src++); + *x = 0; r += 4; g += 4; b += 4; + x += 4; } r += dstPad; g += dstPad; b += dstPad; + x += dstPad; } } else { // Generic code |