dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15135) -Fix/Change: allow str_validate (part of receiving strings from the network) to pass newlines instead of replacing them with question marks, but only when asked to do so.

Browse Source
This commit is contained in:
rubidium
2009-01-18 13:12:57 +00:00
parent 2ce42873d1
commit 1bc8e3f536
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,7 +233,7 @@ uint64 Packet::Recv_uint64()
}
/** Reads a string till it finds a '\0' in the stream */
void Packet::Recv_string(char *buffer, size_t size)
void Packet::Recv_string(char *buffer, size_t size, bool allow_newlines)
{
PacketSize pos;
char *bufp = buffer;
@@ -253,7 +253,7 @@ void Packet::Recv_string(char *buffer, size_t size)
}
this->pos = pos;
str_validate(bufp);
str_validate(bufp, allow_newlines);
}
#endif /* ENABLE_NETWORK */

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

@@ -62,7 +62,7 @@ public:
uint16 Recv_uint16();
uint32 Recv_uint32();
uint64 Recv_uint64();
void Recv_string(char *buffer, size_t size);
void Recv_string(char *buffer, size_t size, bool allow_newlines = false);
};
Packet *NetworkSend_Init(PacketType type);

2
src/network/network_content.cpp
View File

@@ -53,7 +53,7 @@ DEF_CONTENT_RECEIVE_COMMAND(Client, PACKET_CONTENT_SERVER_INFO)
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));
p->Recv_string(ci->description, lengthof(ci->description), true);
ci->unique_id = p->Recv_uint32();
for (uint j = 0; j < sizeof(ci->md5sum); j++) {