0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a gcc warning about strict aliasing rules breakage...

Browse source 
...introduced by 2011-09-10T16:13:22Z!koraq@xs4all.nl
This commit is contained in:
Sergey Popov 2011-09-10 22:17:32 +00:00
parent 981b84b359
commit 732f4eb43a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/network_worker.cpp
View file

@ -592,14 +592,17 @@ static SOCKET_STATE send_file(buffer* buf)
static SOCKET_STATE receive_buf(TCPsocket sock, std::vector<char>& buf)
{
char num_buf[4] ALIGN_4;
bool res = receive_with_timeout(sock,num_buf,4,false);
union {
char buf[4] ALIGN_4;
Uint32 num;
} num_buf;
bool res = receive_with_timeout(sock,num_buf.buf,4,false);
if(!res) {
return SOCKET_ERRORED;
}
const int len = SDLNet_Read32(reinterpret_cast<void*>(num_buf));
const int len = SDLNet_Read32(&num_buf);
if(len < 1 || len > 100000000) {
return SOCKET_ERRORED;