BodgeMaster
/
FOSS-VG
1
0
Fork 0
Code Issues 21 Pull Requests Projects Releases Wiki Activity

lib/nbt: Fix a possible buffer overflow in readString()

Soda
BodgeMaster 2022-08-15 12:02:58 +02:00
parent ca7b121c4d
commit a1fc0ce4b4
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/nbt.cpp
View File

@ -154,6 +154,9 @@ namespace NBT {
if (stringSize.isError) { if (stringSize.isError) {
return ErrorOr<tiny_utf8::string>(true, stringSize.errorCode); return ErrorOr<tiny_utf8::string>(true, stringSize.errorCode);
} }
if (currentPosition + (uint64_t) stringSize.value + 2 > dataSize) {
return ErrorOr<tiny_utf8::string>(true, ErrorCodes::OVERRUN);
}
ErrorOr<tiny_utf8::string> output = JavaCompat::importJavaString(data+currentPosition, stringSize.value); ErrorOr<tiny_utf8::string> output = JavaCompat::importJavaString(data+currentPosition, stringSize.value);
if(output.isError){ if(output.isError){