From 269cf5f5aaaa4098627097cfba75f5dfe5a2b4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Fri, 5 Oct 2012 10:57:25 +0200
Subject: [PATCH] Avoid truncating by shifting unsigned chars

---
 src/lib/CDRParser.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index a1a1fd7..e853404 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -2102,7 +2102,12 @@ void libcdr::CDRParser::readBmp(WPXInputStream *input, unsigned length)
     input->seek(2, WPX_SEEK_CUR);
     unsigned short palettesize = readU16(input);
     for (unsigned short i = 0; i <palettesize; ++i)
-      palette.push_back(readU8(input) | (readU8(input) << 8) | (readU8(input) << 16));
+    {
+      unsigned b = readU8(input);
+      unsigned g = readU8(input);
+      unsigned r = readU8(input);
+      palette.push_back(b | (g << 8) | (r << 16));
+    }
   }
   std::vector<unsigned char> bitmap(bmpsize);
   unsigned long tmpNumBytesRead = 0;
-- 
1.7.10.4