Ken Thomases : winemac: Clamp the number of colors to <= 256 in bitmap_info_size().

Alexandre Julliard julliard at winehq.org
Mon Oct 24 15:57:54 CDT 2016


Module: wine
Branch: master
Commit: 12ea83acb501dc7a9641b7f8d2f5419a2637c5fb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=12ea83acb501dc7a9641b7f8d2f5419a2637c5fb

Author: Ken Thomases <ken at codeweavers.com>
Date:   Sun Oct 23 13:03:26 2016 -0500

winemac: Clamp the number of colors to <= 256 in bitmap_info_size().

… as is done in user32's and gdi32's version of the same function.

Signed-off-by: Ken Thomases <ken at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winemac.drv/clipboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c
index 15f0992..4c66b9f 100644
--- a/dlls/winemac.drv/clipboard.c
+++ b/dlls/winemac.drv/clipboard.c
@@ -395,7 +395,7 @@ static int bitmap_info_size(const BITMAPINFO *info, WORD coloruse)
     }
     else  /* assume BITMAPINFOHEADER */
     {
-        colors = info->bmiHeader.biClrUsed;
+        colors = MIN(info->bmiHeader.biClrUsed, 256);
         if (!colors && (info->bmiHeader.biBitCount <= 8))
             colors = 1 << info->bmiHeader.biBitCount;
         if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3;




More information about the wine-cvs mailing list