g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Bugfix] `qp_ellipse` overflow (#19005)

master
Pablo Martínez 2023-10-08 01:29:27 +02:00 committed by GitHub
parent ab952c358e
commit 21389fbd89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
quantum/painter/qp_draw_ellipse.c
View File

@ -67,10 +67,10 @@ bool qp_ellipse(painter_device_t device, uint16_t x, uint16_t y, uint16_t sizex,
return false; return false;
} }
int16_t aa = ((int16_t)sizex) * ((int16_t)sizex); int32_t aa = ((int32_t)sizex) * ((int32_t)sizex);
int16_t bb = ((int16_t)sizey) * ((int16_t)sizey); int32_t bb = ((int32_t)sizey) * ((int32_t)sizey);
int16_t fa = 4 * ((int16_t)aa); int32_t fa = 4 * aa;
int16_t fb = 4 * ((int16_t)bb); int32_t fb = 4 * bb;
int16_t dx = 0; int16_t dx = 0;
int16_t dy = ((int16_t)sizey); int16_t dy = ((int16_t)sizey);
@ -83,7 +83,7 @@ bool qp_ellipse(painter_device_t device, uint16_t x, uint16_t y, uint16_t sizex,
} }
bool ret = true; bool ret = true;
for (int16_t delta = (2 * bb) + (aa * (1 - (2 * sizey))); bb * dx <= aa * dy; dx++) { for (int32_t delta = (2 * bb) + (aa * (1 - (2 * sizey))); bb * dx <= aa * dy; dx++) {
if (!qp_ellipse_helper_impl(device, x, y, dx, dy, filled)) { if (!qp_ellipse_helper_impl(device, x, y, dx, dy, filled)) {
ret = false; ret = false;
break; break;
@ -98,7 +98,7 @@ bool qp_ellipse(painter_device_t device, uint16_t x, uint16_t y, uint16_t sizex,
dx = sizex; dx = sizex;
dy = 0; dy = 0;
for (int16_t delta = (2 * aa) + (bb * (1 - (2 * sizex))); aa * dy <= bb * dx; dy++) { for (int32_t delta = (2 * aa) + (bb * (1 - (2 * sizex))); aa * dy <= bb * dx; dy++) {
if (!qp_ellipse_helper_impl(device, x, y, dx, dy, filled)) { if (!qp_ellipse_helper_impl(device, x, y, dx, dy, filled)) {
ret = false; ret = false;
break; break;