franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extractbits robustness

This commit is contained in:
Ameer J 2023-07-30 13:05:45 -04:00
parent 0078e5a338
commit d17a51bc59
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/video_core/host_shaders/astc_decoder.comp
View File

@ -349,14 +349,17 @@ uint ExtractBits(uvec4 payload, int offset, int bits) {
if (bits <= 0) { if (bits <= 0) {
return 0; return 0;
} }
int last_offset = offset + bits - 1; if (bits > 32) {
int shifted_offset = offset >> 5; return 0;
}
const int last_offset = offset + bits - 1;
const int shifted_offset = offset >> 5;
if ((last_offset >> 5) == shifted_offset) { if ((last_offset >> 5) == shifted_offset) {
return bitfieldExtract(payload[shifted_offset], offset & 31, bits); return bitfieldExtract(payload[shifted_offset], offset & 31, bits);
} }
int first_bits = 32 - (offset & 31); const int first_bits = 32 - (offset & 31);
int result_first = int(bitfieldExtract(payload[shifted_offset], offset & 31, first_bits)); const int result_first = int(bitfieldExtract(payload[shifted_offset], offset & 31, first_bits));
int result_second = int(bitfieldExtract(payload[shifted_offset + 1], 0, bits - first_bits)); const int result_second = int(bitfieldExtract(payload[shifted_offset + 1], 0, bits - first_bits));
return result_first | (result_second << first_bits); return result_first | (result_second << first_bits);
} }