mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-19 20:49:11 +00:00
Code Issues Activity

(svn r23590) -Codechange: make the string validation settings better expandable

Browse Source
This commit is contained in:
rubidium
2011-12-18 18:37:54 +00:00
parent 6ae8cac432
commit fefe22b4aa
8 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/core/packet.cpp
View File

@@ -283,9 +283,9 @@ uint64 Packet::Recv_uint64()
* Reads a string till it finds a '\0' in the stream.
* @param buffer The buffer to put the data into.
* @param size The size of the buffer.
* @param allow_newlines Whether the string validation should remove newlines.
* @param settings The string validation settings.
*/
void Packet::Recv_string(char *buffer, size_t size, bool allow_newlines)
void Packet::Recv_string(char *buffer, size_t size, StringValidationSettings settings)
{
PacketSize pos;
char *bufp = buffer;
@@ -306,7 +306,7 @@ void Packet::Recv_string(char *buffer, size_t size, bool allow_newlines)
}
this->pos = pos;
str_validate(bufp, last, allow_newlines);
str_validate(bufp, last, settings);
}
#endif /* ENABLE_NETWORK */

3
src/network/core/packet.h
View File

@@ -16,6 +16,7 @@
#include "config.h"
#include "core.h"
#include "../../string_type.h"
#ifdef ENABLE_NETWORK
@@ -83,7 +84,7 @@ public:
uint16 Recv_uint16();
uint32 Recv_uint32();
uint64 Recv_uint64();
void Recv_string(char *buffer, size_t size, bool allow_newlines = false);
void Recv_string(char *buffer, size_t size, StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK);
};
#endif /* ENABLE_NETWORK */

2
src/network/network_content.cpp
View File

@@ -56,7 +56,7 @@ bool ClientNetworkContentSocketHandler::Receive_SERVER_INFO(Packet *p)
p->Recv_string(ci->name, lengthof(ci->name));
p->Recv_string(ci->version, lengthof(ci->name));
p->Recv_string(ci->url, lengthof(ci->url));
p->Recv_string(ci->description, lengthof(ci->description), true);
p->Recv_string(ci->description, lengthof(ci->description), SVS_REPLACE_WITH_QUESTION_MARK | SVS_ALLOW_NEWLINE);
ci->unique_id = p->Recv_uint32();
for (uint j = 0; j < sizeof(ci->md5sum); j++) {