diff options
| author | rubidium <rubidium@openttd.org> | 2009-03-06 01:23:25 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-03-06 01:23:25 +0000 |
| commit | 86ca408d469811d13a15d5c7a671feda38126eb0 (patch) | |
| tree | 8972c2c7b9b1ab7c2b41b46cd9a44f1bb0fbd9bd /src/network/core/packet.cpp | |
| parent | c3a7e6b693716232fd2aefab3f36bd555620b563 (diff) | |
| download | openttd-86ca408d469811d13a15d5c7a671feda38126eb0.tar.xz | |
(svn r15626) -Fix [FS#2698]: UTF8 string handling could cause buffer overruns.
Diffstat (limited to 'src/network/core/packet.cpp')
| -rw-r--r-- | src/network/core/packet.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/core/packet.cpp b/src/network/core/packet.cpp index 5c06ab488..013235d11 100644 --- a/src/network/core/packet.cpp +++ b/src/network/core/packet.cpp @@ -237,6 +237,7 @@ void Packet::Recv_string(char *buffer, size_t size, bool allow_newlines) { PacketSize pos; char *bufp = buffer; + const char *last = buffer + size - 1; /* Don't allow reading from a closed socket */ if (cs->HasClientQuit()) return; @@ -253,7 +254,7 @@ void Packet::Recv_string(char *buffer, size_t size, bool allow_newlines) } this->pos = pos; - str_validate(bufp, allow_newlines); + str_validate(bufp, last, allow_newlines); } #endif /* ENABLE_NETWORK */ |