ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gfx3d: fix condition where matrices could be read/write out of bounds of the matrix stack, clobbering some other variable in the emulator

This commit is contained in:
zeromus 2009-04-27 21:08:17 +00:00
parent 28b1fcdcd6
commit 7b1af20be4
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/gfx3d.cpp
View File

@ -414,6 +414,8 @@ void gfx3d_glStoreMatrix(u32 v)
if(mymode==0)
v = 0;
if(v==31) v=30; //? what should happen in this case?
MatrixStackLoadMatrix (&mtxStack[mymode], v&31, mtxCurrent[mymode]);
if(mymode==2)
MatrixStackLoadMatrix (&mtxStack[1], v&31, mtxCurrent[1]);
@ -428,6 +430,8 @@ void gfx3d_glRestoreMatrix(u32 v)
if(mymode==0)
v = 0;
if(v==31) v=30; //? what should happen in this case?
MatrixCopy (mtxCurrent[mymode], MatrixStackGetPos(&mtxStack[mymode], v&31));
if (mymode == 2)
MatrixCopy (mtxCurrent[1], MatrixStackGetPos(&mtxStack[1], v&31));

3
desmume/src/matrix.cpp
View File

@ -22,6 +22,7 @@
#include <string.h>
#include <stdlib.h>
#include <math.h>
#include <assert.h>
#include "matrix.h"
extern "C" {
@ -213,6 +214,7 @@ float * MatrixStackPopMatrix (MatrixStack *stack, int size)
float * MatrixStackGetPos (MatrixStack *stack, int pos)
{
assert(pos<31);
return &stack->matrix[pos*16];
}
@ -223,6 +225,7 @@ float * MatrixStackGet (MatrixStack *stack)
void MatrixStackLoadMatrix (MatrixStack *stack, int pos, const float *ptr)
{
assert(pos<31);
MatrixCopy (&stack->matrix[pos*16], ptr);
}