summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2010-09-19 18:43:45 +0400
committerAndrey Nazarov <skuller@skuller.net>2010-09-19 20:06:56 +0400
commit50d6ace91a48eed3dc82da9823c420d0c63f38a7 (patch)
treeaa46f85baf9d3ddc49515476a7729f966a9edda7
parentcea1e6775af6bccb3b739d563f26bbd8cea1ad70 (diff)
Avoid type-punning in Netchan_OutOfBand.
-rw-r--r--src/net_chan.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/net_chan.c b/src/net_chan.c
index cb610e4..023da21 100644
--- a/src/net_chan.c
+++ b/src/net_chan.c
@@ -137,24 +137,26 @@ void Netchan_OutOfBand( netsrc_t sock, const netadr_t *address,
const char *format, ... )
{
va_list argptr;
- char buffer[MAX_PACKETLEN_DEFAULT];
+ struct {
+ uint32_t header;
+ char data[MAX_PACKETLEN_DEFAULT-4];
+ } packet;
size_t len;
// write the packet header
- *( uint32_t * )buffer = 0xffffffff;
- len = 4;
+ packet.header = 0xffffffff;
va_start( argptr, format );
- len += Q_vsnprintf( buffer + len, sizeof( buffer ) - len, format, argptr );
+ len = Q_vsnprintf( packet.data, sizeof( packet.data ), format, argptr );
va_end( argptr );
- if( len >= sizeof( buffer ) ) {
+ if( len >= sizeof( packet.data ) ) {
Com_WPrintf( "%s: overflow\n", __func__ );
return;
}
// send the datagram
- NET_SendPacket( sock, address, len, buffer );
+ NET_SendPacket( sock, address, len + 4, &packet );
}
// ============================================================================