Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ASAN reports: runtime error: left shift of XXX by 24 places cannot be represented in type 'int' #330

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Fix ASAN reports: runtime error: left shift of XXX by 24 places cannot be represented in type 'int' #330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/SDL_ttf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ static SDL_INLINE void BG_Blended_Opaque_SDF(const TTF_Image *image, Uint32 *des
/* *INDENT-OFF* */
DUFFS_LOOP4(
d = *dst;
s = *src++ << 24;
s = ((Uint32)*src++) << 24;
if (s > d) {
*dst = s;
}
Expand Down Expand Up @@ -539,7 +539,7 @@ static SDL_INLINE void BG_Blended_Opaque(const TTF_Image *image, Uint32 *destina
while (height--) {
/* *INDENT-OFF* */
DUFFS_LOOP4(
*dst++ |= *src++ << 24;
*dst++ |= ((Uint32)*src++) << 24;
, width);
/* *INDENT-ON* */
src += srcskip;
Expand Down Expand Up @@ -580,10 +580,10 @@ static SDL_INLINE void BG_Blended_Opaque_32(const TTF_Image *image, Uint32 *dest
while (height--) {
/* *INDENT-OFF* */
DUFFS_LOOP4(
*dst++ |= *src++ << 24;
*dst++ |= *src++ << 24;
*dst++ |= *src++ << 24;
*dst++ |= *src++ << 24;
*dst++ |= ((Uint32)*src++) << 24;
*dst++ |= ((Uint32)*src++) << 24;
*dst++ |= ((Uint32)*src++) << 24;
*dst++ |= ((Uint32)*src++) << 24;
, width);
/* *INDENT-ON* */
src += srcskip;
Expand Down Expand Up @@ -1551,7 +1551,7 @@ static SDL_Surface *Create_Surface_Blended(int width, int height, SDL_Color fg,
bgcolor = (fg.r << 16) | (fg.g << 8) | fg.b;

/* Underline/Strikethrough color style */
*color = bgcolor | (fg.a << 24);
*color = bgcolor | ((Uint32)fg.a << 24);

/* Create the target surface if required */
if (width != 0) {
Expand All @@ -1575,10 +1575,10 @@ static SDL_Surface* Create_Surface_LCD(int width, int height, SDL_Color fg, SDL_
Uint32 bgcolor;

/* Background color */
bgcolor = (bg.a << 24) | (bg.r << 16) | (bg.g << 8) | bg.b;
bgcolor = (((Uint32)bg.a) << 24) | (bg.r << 16) | (bg.g << 8) | bg.b;

/* Underline/Strikethrough color style */
*color = (bg.a << 24) | (fg.r << 16) | (fg.g << 8) | fg.b;
*color = (((Uint32)bg.a) << 24) | (fg.r << 16) | (fg.g << 8) | fg.b;

/* Create the target surface if required */
if (width != 0) {
Expand Down
Loading