Skip to content

Add some potential out-of-bounds access prevention and wrong pixel wrapping #336

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

Merged
DCurrent merged 3 commits into from
Sep 21, 2025
+6 −10
Merged

Add some potential out-of-bounds access prevention and wrong pixel wrapping #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dbd0fb
Merge branch 'master' of https://github.com/toxieainc/openbor
toxieainc Aug 16, 2025
b9b25e9
fix some potential out-of bounds access (and one-pixel x-axis wrapping)
toxieainc Sep 19, 2025
dfcbb12
d'oh
toxieainc Sep 19, 2025
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
2 changes: 1 addition & 1 deletion engine/openbor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44341,7 +44341,7 @@ void spawnplayer(int index)
//////////////////checking holes/ walls///////////////////////////////////
for(xc = 0; xc < videomodes.hRes / 4; xc++)
{
if(p.position.x > videomodes.hRes)
if(p.position.x >= videomodes.hRes)
{
p.position.x -= videomodes.hRes;
}
Expand Down
4 changes: 2 additions & 2 deletions engine/openborscript.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16156,7 +16156,7 @@ HRESULT openbor_getgfxproperty(ScriptVariant **varlist , ScriptVariant **pretvar
{
case bitmap_magic: //As long as the two structures are identical...
case screen_magic:
if(x < 0 || x >= screen->width || y < 0 || y >= screen->height)
if((unsigned)x >= (unsigned)screen->width || (unsigned)y >= (unsigned)screen->height) // includes checks for <0
{
v = 0;
}
Expand All @@ -16180,7 +16180,7 @@ HRESULT openbor_getgfxproperty(ScriptVariant **varlist , ScriptVariant **pretvar
}
break;
case sprite_magic:
if(x < 0 || x >= sprite->width || y < 0 || y >= sprite->height)
if((unsigned)x >= (unsigned)sprite->width || (unsigned)y >= (unsigned)sprite->height) // includes checks for <0
{
v = 0;
}
Expand Down
2 changes: 1 addition & 1 deletion engine/source/gamelib/draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ void _putpixel(int x, int y, int colour, s_screen *screen, int alpha)
{
int pixind;
unsigned char *lut;
if((unsigned)x > screen->width || (unsigned)y > screen->height)
if((unsigned)x >= (unsigned)screen->width || (unsigned)y >= (unsigned)screen->height)
{
return;
}
Expand Down
4 changes: 1 addition & 3 deletions engine/source/gamelib/draw16.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ void _putpixel16(unsigned x, unsigned y, unsigned short colour, s_screen *screen
int pixind;
unsigned short *data ;
unsigned short(*blendfp)(unsigned short, unsigned short);
if(x > screen->width || y > screen->height)
if(x >= (unsigned)screen->width || y >= (unsigned)screen->height)
{
return;
}
Expand All @@ -283,5 +283,3 @@ void _putpixel16(unsigned x, unsigned y, unsigned short colour, s_screen *screen
blendfp = getblendfunction16(alpha);
__putpixel16(data);
}


4 changes: 1 addition & 3 deletions engine/source/gamelib/draw32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ void _putpixel32(unsigned x, unsigned y, unsigned colour, s_screen *screen, int
int pixind;
unsigned *data ;
unsigned(*blendfp)(unsigned, unsigned);
if(x > screen->width || y > screen->height)
if(x >= (unsigned)screen->width || y >= (unsigned)screen->height)
{
return;
}
Expand All @@ -287,5 +287,3 @@ void _putpixel32(unsigned x, unsigned y, unsigned colour, s_screen *screen, int
blendfp = getblendfunction32(alpha);
__putpixel32(data);
}


Loading