zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mapster32: fix a possible oob read via drawspritelabel; sanitize 2d3d mode.

Browse source 
That is, in m32_is2d3dmode(), also check if 2d and 3d mode resultions are
the same. Otherwise, oob writes (e.g. via tileinfo_doprint()) and other
thinkable niceties may ensue.

git-svn-id: https://svn.eduke32.com/eduke32@5291 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-07-11 14:13:04 +00:00
parent 21e9125f2d
commit 0419e64c0a
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/build/include/editor.h
View file

@ -370,9 +370,16 @@ extern vec2_t m32_2d3d;
#define XSIZE_2D3D (xdim2d / m32_2d3dsize) #define XSIZE_2D3D (xdim2d / m32_2d3dsize)
#define YSIZE_2D3D (ydim2d / m32_2d3dsize) #define YSIZE_2D3D (ydim2d / m32_2d3dsize)
static inline int32_t m32_2d3d_resolutions_match()
{
return (xdimgame == xdim2d && ydimgame == ydim2d);
}
static inline int32_t m32_is2d3dmode(void) static inline int32_t m32_is2d3dmode(void)
{ {
return !in3dmode() && m32_2d3dmode && searchx > m32_2d3d.x && searchx < (m32_2d3d.x + XSIZE_2D3D) && return !in3dmode() && m32_2d3dmode &&
m32_2d3d_resolutions_match() &&
searchx > m32_2d3d.x && searchx < (m32_2d3d.x + XSIZE_2D3D) &&
searchy > m32_2d3d.y && searchy < (m32_2d3d.y + YSIZE_2D3D); searchy > m32_2d3d.y && searchy < (m32_2d3d.y + YSIZE_2D3D);
} }

5
polymer/eduke32/build/src/build.c
View file

@ -3252,6 +3252,11 @@ static void isc_transform(int32_t *x, int32_t *y)
static void drawspritelabel(int i) static void drawspritelabel(int i)
{ {
// XXX: oob 'i' may happen, such as passing pointhighlight-16384 when
// pointhighlight == -1.
if ((unsigned)i >= MAXSPRITES)
return;
const char *dabuffer = CallExtGetSpriteCaption(i); const char *dabuffer = CallExtGetSpriteCaption(i);
if (!dabuffer[0]) if (!dabuffer[0])

2
polymer/eduke32/source/astub.c
View file

@ -10482,7 +10482,7 @@ static void Keys2d3d(void)
{ {
keystatus[KEYSC_F10]=0; keystatus[KEYSC_F10]=0;
if (xdimgame != xdim2d || ydimgame != ydim2d) if (!m32_2d3d_resolutions_match())
message("2d and 3d mode resolutions don't match!"); message("2d and 3d mode resolutions don't match!");
else if (!in3dmode()) else if (!in3dmode())