Skip to content

S
swiftshader
Commit 00555c47 by Nicolas Capens
Options

Fix ETC1 decoding writing outside of internal buffer.

Bug 22632766 Change-Id: Ib2fccdd498a6da43af7bb945179b278026cdba18 Reviewed-on: https://swiftshader-review.googlesource.com/3744Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent b938c3ce
Showing with 16 additions and 16 deletions
src/Renderer/Surface.cpp
...@@ -2032,32 +2032,32 @@ namespace sw ...@@ -2032,32 +2032,32 @@ namespace sw
if(source->flipbit) if(source->flipbit)
{ {
for(int y = 0; y < 2; y++) for(int j = 0; j < 2 && (y + j) < internal.height; j++)
{ {
color[0] = subblockColors0[source->getIndex(0, y)]; if((x + 0) < internal.width) color[0] = subblockColors0[source->getIndex(0, j)];
color[1] = subblockColors0[source->getIndex(1, y)]; if((x + 1) < internal.width) color[1] = subblockColors0[source->getIndex(1, j)];
color[2] = subblockColors0[source->getIndex(2, y)]; if((x + 2) < internal.width) color[2] = subblockColors0[source->getIndex(2, j)];
color[3] = subblockColors0[source->getIndex(3, y)]; if((x + 3) < internal.width) color[3] = subblockColors0[source->getIndex(3, j)];
color += internal.width; color += internal.width;
} }
for(int y = 2; y < 4; y++) for(int j = 2; j < 4 && (y + j) < internal.height; j++)
{ {
color[0] = subblockColors1[source->getIndex(0, y)]; if((x + 0) < internal.width) color[0] = subblockColors1[source->getIndex(0, j)];
color[1] = subblockColors1[source->getIndex(1, y)]; if((x + 1) < internal.width) color[1] = subblockColors1[source->getIndex(1, j)];
color[2] = subblockColors1[source->getIndex(2, y)]; if((x + 2) < internal.width) color[2] = subblockColors1[source->getIndex(2, j)];
color[3] = subblockColors1[source->getIndex(3, y)]; if((x + 3) < internal.width) color[3] = subblockColors1[source->getIndex(3, j)];
color += internal.width; color += internal.width;
} }
} }
else else
{ {
for(int y = 0; y < 4; y++) for(int j = 0; j < 4 && (y + j) < internal.height; j++)
{ {
color[0] = subblockColors0[source->getIndex(0, y)]; if((x + 0) < internal.width) color[0] = subblockColors0[source->getIndex(0, j)];
color[1] = subblockColors0[source->getIndex(1, y)]; if((x + 1) < internal.width) color[1] = subblockColors0[source->getIndex(1, j)];
color[2] = subblockColors1[source->getIndex(2, y)]; if((x + 2) < internal.width) color[2] = subblockColors1[source->getIndex(2, j)];
color[3] = subblockColors1[source->getIndex(3, y)]; if((x + 3) < internal.width) color[3] = subblockColors1[source->getIndex(3, j)];
color += internal.width; color += internal.width;
} }
} }
...@@ -2072,7 +2072,7 @@ namespace sw ...@@ -2072,7 +2072,7 @@ namespace sw
unsigned int Surface::size(int width, int height, int depth, Format format) unsigned int Surface::size(int width, int height, int depth, Format format)
{ {
// Dimensions rounded up to multiples of 4, used for DXTC formats // Dimensions rounded up to multiples of 4, used for compressed formats
int width4 = (width + 3) & ~3; int width4 = (width + 3) & ~3;
int height4 = (height + 3) & ~3; int height4 = (height + 3) & ~3;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment