geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed overflow in SDL_SoftStretch() (see #8878)

main
Sylvain 2024-01-20 06:33:38 +01:00 committed by Sylvain Becker
parent 64972b4184
commit 7b02d328fa
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/SDL_stretch.c
View File

@ -144,8 +144,10 @@ int SDL_SoftStretch(SDL_Surface *src, const SDL_Rect *srcrect,
#define BILINEAR___START \ #define BILINEAR___START \
int i; \ int i; \
int fp_sum_h, fp_step_h, left_pad_h, right_pad_h; \ Sint64 fp_sum_h; \
int fp_sum_w, fp_step_w, left_pad_w, right_pad_w; \ int fp_step_h, left_pad_h, right_pad_h; \
Sint64 fp_sum_w; \
int fp_step_w, left_pad_w, right_pad_w; \
int fp_sum_w_init, left_pad_w_init, right_pad_w_init, dst_gap, middle_init; \ int fp_sum_w_init, left_pad_w_init, right_pad_w_init, dst_gap, middle_init; \
get_scaler_datas(src_h, dst_h, &fp_sum_h, &fp_step_h, &left_pad_h, &right_pad_h); \ get_scaler_datas(src_h, dst_h, &fp_sum_h, &fp_step_h, &left_pad_h, &right_pad_h); \
get_scaler_datas(src_w, dst_w, &fp_sum_w, &fp_step_w, &left_pad_w, &right_pad_w); \ get_scaler_datas(src_w, dst_w, &fp_sum_w, &fp_step_w, &left_pad_w, &right_pad_w); \
@ -189,12 +191,12 @@ int SDL_SoftStretch(SDL_Surface *src, const SDL_Rect *srcrect,
// OK with clang 12.0.0 / Xcode // OK with clang 12.0.0 / Xcode
__attribute__((noinline)) __attribute__((noinline))
#endif #endif
static void get_scaler_datas(int src_nb, int dst_nb, int *fp_start, int *fp_step, int *left_pad, int *right_pad) static void get_scaler_datas(int src_nb, int dst_nb, Sint64 *fp_start, int *fp_step, int *left_pad, int *right_pad)
{ {
int step = FIXED_POINT(src_nb) / (dst_nb); /* source step in fixed point */ int step = FIXED_POINT(src_nb) / (dst_nb); /* source step in fixed point */
int x0 = FP_ONE / 2; /* dst first pixel center at 0.5 in fixed point */ int x0 = FP_ONE / 2; /* dst first pixel center at 0.5 in fixed point */
int fp_sum; Sint64 fp_sum;
int i; int i;
#if 0 #if 0
/* scale to source coordinates */ /* scale to source coordinates */