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

[Base] Changed size of bitstream accessed data (Risky) 

This prevents crashing in situation when buffer_ + offset_bytes is
at the end of allocated memory range and can go into unallocated space
This commit is contained in:
Gliniak 2022-07-25 10:52:21 +02:00
parent 364137ef5f
commit 061000af01
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/base/bit_stream.cc
View File

@ -41,7 +41,7 @@ uint64_t BitStream::Peek(size_t num_bits) {
// offset --> // offset -->
// ..[junk]..| target bits |....[junk]............. // ..[junk]..| target bits |....[junk].............
uint64_t bits = *(uint64_t*)(buffer_ + offset_bytes); uint32_t bits = *(uint32_t*)(buffer_ + offset_bytes);
// We need the data in little endian. // We need the data in little endian.
// TODO: Have a flag specifying endianness of data? // TODO: Have a flag specifying endianness of data?
@ -49,7 +49,7 @@ uint64_t BitStream::Peek(size_t num_bits) {
// Shift right // Shift right
// .....[junk]........| target bits | // .....[junk]........| target bits |
bits >>= 64 - (rel_offset_bits + num_bits); bits >>= 32 - (rel_offset_bits + num_bits);
// AND with mask // AND with mask
// ...................| target bits | // ...................| target bits |