encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More "Integer overflow generates Illegal instruction under sanitizers" (see bug #4995)

This commit is contained in:
Sylvain 2021-11-23 09:41:01 +01:00
parent 8dd6edec00
commit 9c72adc86c
No known key found for this signature in database
GPG Key ID: 5F87E02E5BC0939E
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/SDL_pixels.c
View File

@ -871,7 +871,7 @@ SDL_MapRGBA(const SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b,
return (r >> format->Rloss) << format->Rshift return (r >> format->Rloss) << format->Rshift
| (g >> format->Gloss) << format->Gshift | (g >> format->Gloss) << format->Gshift
| (b >> format->Bloss) << format->Bshift | (b >> format->Bloss) << format->Bshift
| ((a >> format->Aloss) << format->Ashift & format->Amask); | ((Uint32)(a >> format->Aloss) << format->Ashift & format->Amask);
} else { } else {
return SDL_FindColor(format->palette, r, g, b, a); return SDL_FindColor(format->palette, r, g, b, a);
} }
@ -983,7 +983,7 @@ Map1toN(SDL_PixelFormat * src, Uint8 Rmod, Uint8 Gmod, Uint8 Bmod, Uint8 Amod,
Uint8 G = (Uint8) ((pal->colors[i].g * Gmod) / 255); Uint8 G = (Uint8) ((pal->colors[i].g * Gmod) / 255);
Uint8 B = (Uint8) ((pal->colors[i].b * Bmod) / 255); Uint8 B = (Uint8) ((pal->colors[i].b * Bmod) / 255);
Uint8 A = (Uint8) ((pal->colors[i].a * Amod) / 255); Uint8 A = (Uint8) ((pal->colors[i].a * Amod) / 255);
ASSEMBLE_RGBA(&map[i * bpp], dst->BytesPerPixel, dst, R, G, B, A); ASSEMBLE_RGBA(&map[i * bpp], dst->BytesPerPixel, dst, (Uint32)R, (Uint32)G, (Uint32)B, (Uint32)A);
} }
return (map); return (map);
} }