edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4312

Browse source 
4312: Don't access out of bounds in linereader (fixes #4308) r=heinrich5991 a=def-

If someone wants to look more closely, maybe there is a better fix

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2021-11-07 01:29:53 +00:00 committed by GitHub
parent 66fdc39f9c 030163b1d9
commit cc96d90ecb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/shared/linereader.cpp
View file

@ -4,7 +4,7 @@
void CLineReader::Init(IOHANDLE File) void CLineReader::Init(IOHANDLE File)
{ {
m_BufferMaxSize = sizeof(m_aBuffer); m_BufferMaxSize = sizeof(m_aBuffer) - 1;
m_BufferSize = 0; m_BufferSize = 0;
m_BufferPos = 0; m_BufferPos = 0;
m_File = File; m_File = File;

2
src/engine/shared/linereader.h
View file

@ -7,7 +7,7 @@
// buffered stream for reading lines, should perhaps be something smaller // buffered stream for reading lines, should perhaps be something smaller
class CLineReader class CLineReader
{ {
char m_aBuffer[4 * 8192]; char m_aBuffer[4 * 8192 + 1]; // 1 additional byte for null termination
unsigned m_BufferPos; unsigned m_BufferPos;
unsigned m_BufferSize; unsigned m_BufferSize;
unsigned m_BufferMaxSize; unsigned m_BufferMaxSize;