1*4882a593Smuzhiyun# HG changeset patch 2*4882a593Smuzhiyun# User Sam Lantinga <slouken@libsdl.org> 3*4882a593Smuzhiyun# Date 1550504903 28800 4*4882a593Smuzhiyun# Mon Feb 18 07:48:23 2019 -0800 5*4882a593Smuzhiyun# Branch SDL-1.2 6*4882a593Smuzhiyun# Node ID 19d8c3b9c25143f71a34ff40ce1df91b4b3e3b78 7*4882a593Smuzhiyun# Parent 8586f153eedec4c4e07066d6248ebdf67f10a229 8*4882a593SmuzhiyunFixed bug 4500 - Heap-Buffer Overflow in Map1toN pertaining to SDL_pixels.c 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunPetr Pisar 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunThe reproducer has these data in BITMAPINFOHEADER: 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunbiSize = 40 15*4882a593SmuzhiyunbiBitCount = 8 16*4882a593SmuzhiyunbiClrUsed = 131075 17*4882a593Smuzhiyun 18*4882a593SmuzhiyunSDL_LoadBMP_RW() function passes biBitCount as a color depth to SDL_CreateRGBSurface(), thus 256-color pallete is allocated. But then biClrUsed colors are read from a file and stored into the palette. SDL_LoadBMP_RW should report an error if biClrUsed is greater than 2^biBitCount. 19*4882a593Smuzhiyun 20*4882a593SmuzhiyunCVE: CVE-2019-7638 21*4882a593SmuzhiyunCVE: CVE-2019-7636 22*4882a593SmuzhiyunUpstream-Status: Backport 23*4882a593SmuzhiyunSigned-off-by: Anuj Mittal <anuj.mittal@intel.com> 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff -r 8586f153eede -r 19d8c3b9c251 src/video/SDL_bmp.c 26*4882a593Smuzhiyun--- a/src/video/SDL_bmp.c Sun Jan 13 15:27:50 2019 +0100 27*4882a593Smuzhiyun+++ b/src/video/SDL_bmp.c Mon Feb 18 07:48:23 2019 -0800 28*4882a593Smuzhiyun@@ -233,6 +233,10 @@ 29*4882a593Smuzhiyun if ( palette ) { 30*4882a593Smuzhiyun if ( biClrUsed == 0 ) { 31*4882a593Smuzhiyun biClrUsed = 1 << biBitCount; 32*4882a593Smuzhiyun+ } else if ( biClrUsed > (1 << biBitCount) ) { 33*4882a593Smuzhiyun+ SDL_SetError("BMP file has an invalid number of colors"); 34*4882a593Smuzhiyun+ was_error = SDL_TRUE; 35*4882a593Smuzhiyun+ goto done; 36*4882a593Smuzhiyun } 37*4882a593Smuzhiyun if ( biSize == 12 ) { 38*4882a593Smuzhiyun for ( i = 0; i < (int)biClrUsed; ++i ) { 39