commit f81148c43a25d4c69e635b6ad13eab674b473aca
author Pierre Ossman <ossman@cendio.se> Wed Jul 25 20:44:32 2018 +0200
committer Pierre Ossman <ossman@cendio.se> Wed Jul 25 20:44:32 2018 +0200
tree 608c1605e931b1fe2456ec7c236aec3c18207fbc
parent d3a3fd692f9ee83164590338118034422308579c

Avoid integer overflows in pixel size calculations

common/rfb/EncodeManager.cxx

diff --git a/common/rfb/EncodeManager.cxx b/common/rfb/EncodeManager.cxx
index 0ce611e..53e0365 100644
--- a/common/rfb/EncodeManager.cxx
+++ b/common/rfb/EncodeManager.cxx
@@ -519,7 +519,7 @@
 
   stats[klass][activeType].rects++;
   stats[klass][activeType].pixels += rect.area();
-  equiv = 12 + rect.area() * conn->cp.pf().bpp/8;
+  equiv = 12 + rect.area() * (conn->cp.pf().bpp/8);
   stats[klass][activeType].equivalent += equiv;
 
   encoder = encoders[klass];
@@ -561,7 +561,7 @@
 
     copyStats.rects++;
     copyStats.pixels += rect->area();
-    equiv = 12 + rect->area() * conn->cp.pf().bpp/8;
+    equiv = 12 + rect->area() * (conn->cp.pf().bpp/8);
     copyStats.equivalent += equiv;
 
     conn->writer()->writeCopyRect(*rect, rect->tl.x - delta.x,