drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix loop condition in Compress4 functions - prevent accessing outside array bounds

Browse Source
This commit is contained in:
Mrkva 2015-12-29 10:55:08 +01:00
parent 9b79638f79
commit b74a5b6933
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvtt/squish/fastclusterfit.cpp
View File

@ -256,15 +256,15 @@ void FastClusterFit::Compress4( void* block )
int i = 0; int i = 0;
// check all possible clusters for this total order // check all possible clusters for this total order
for( int c0 = 0; c0 <= 16; c0++) for( int c0 = 0; c0 < 16; c0++)
{ {
Vec4 x1 = zero; Vec4 x1 = zero;
for( int c1 = 0; c1 <= 16-c0; c1++) for( int c1 = 0; c1 < 16-c0; c1++)
{ {
Vec4 x2 = zero; Vec4 x2 = zero;
for( int c2 = 0; c2 <= 16-c0-c1; c2++) for( int c2 = 0; c2 < 16-c0-c1; c2++)
{ {
Vec4 const constants = Vec4((const float *)&s_fourElement[i]); Vec4 const constants = Vec4((const float *)&s_fourElement[i]);
Vec4 const alpha2_sum = constants.SplatX(); Vec4 const alpha2_sum = constants.SplatX();

6
src/nvtt/squish/weightedclusterfit.cpp
View File

@ -264,15 +264,15 @@ void WeightedClusterFit::Compress4( void* block )
int b0 = 0, b1 = 0, b2 = 0; int b0 = 0, b1 = 0, b2 = 0;
// check all possible clusters for this total order // check all possible clusters for this total order
for( int c0 = 0; c0 <= count; c0++) for( int c0 = 0; c0 < count; c0++)
{ {
Vec4 x1 = zero; Vec4 x1 = zero;
for( int c1 = 0; c1 <= count-c0; c1++) for( int c1 = 0; c1 < count-c0; c1++)
{ {
Vec4 x2 = zero; Vec4 x2 = zero;
for( int c2 = 0; c2 <= count-c0-c1; c2++) for( int c2 = 0; c2 < count-c0-c1; c2++)
{ {
Vec4 const x3 = m_xsum - x2 - x1 - x0; Vec4 const x3 = m_xsum - x2 - x1 - x0;