v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix out-of-bounds read in MaterialSystem unit test

pull/1432/head
Turo Lamminen 2017-09-14 09:38:07 +03:00
parent 5ecab20bd0
commit da96b32fb9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/utMaterialSystem.cpp
View File

@ -73,7 +73,7 @@ TEST_F(MaterialSystemTest, testFloatArrayProperty)
{ {
float pf[] = {0.0f,1.0f,2.0f,3.0f}; float pf[] = {0.0f,1.0f,2.0f,3.0f};
unsigned int pMax = sizeof(pf) / sizeof(float); unsigned int pMax = sizeof(pf) / sizeof(float);
this->pcMat->AddProperty(&pf,pMax,"testKey2"); this->pcMat->AddProperty(pf,pMax,"testKey2");
pf[0] = pf[1] = pf[2] = pf[3] = 12.0f; pf[0] = pf[1] = pf[2] = pf[3] = 12.0f;
EXPECT_EQ(AI_SUCCESS, pcMat->Get("testKey2",0,0,pf,&pMax)); EXPECT_EQ(AI_SUCCESS, pcMat->Get("testKey2",0,0,pf,&pMax));
@ -97,7 +97,7 @@ TEST_F(MaterialSystemTest, testIntArrayProperty)
{ {
int pf[] = {0,1,2,3}; int pf[] = {0,1,2,3};
unsigned int pMax = sizeof(pf) / sizeof(int); unsigned int pMax = sizeof(pf) / sizeof(int);
this->pcMat->AddProperty(&pf,pMax,"testKey4"); this->pcMat->AddProperty(pf,pMax,"testKey4");
pf[0] = pf[1] = pf[2] = pf[3] = 12; pf[0] = pf[1] = pf[2] = pf[3] = 12;
EXPECT_EQ(AI_SUCCESS, pcMat->Get("testKey4",0,0,pf,&pMax)); EXPECT_EQ(AI_SUCCESS, pcMat->Get("testKey4",0,0,pf,&pMax));