From d8ece2e3e951e070b37f670bd910d24855be5262 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sun, 10 Mar 2019 18:53:02 +0000
Subject: Fix serialization of std::time_t by casting to u64 first (#8353)

Fixes #8332
---
 src/network/clientpackethandler.cpp |  4 +++-
 src/network/networkpacket.cpp       | 16 ----------------
 src/network/networkpacket.h         |  4 ----
 3 files changed, 3 insertions(+), 21 deletions(-)

(limited to 'src/network')

diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 889002a82..2f5deae2a 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -408,7 +408,9 @@ void Client::handleCommand_ChatMessage(NetworkPacket *pkt)
 		return;
 	}
 
-	*pkt >> chatMessage->sender >> chatMessage->message >> chatMessage->timestamp;
+	u64 timestamp;
+	*pkt >> chatMessage->sender >> chatMessage->message >> timestamp;
+	chatMessage->timestamp = static_cast<std::time_t>(timestamp);
 
 	chatMessage->type = (ChatMessageType) message_type;
 
diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp
index 6d869e5eb..22c035c5b 100644
--- a/src/network/networkpacket.cpp
+++ b/src/network/networkpacket.cpp
@@ -281,12 +281,6 @@ NetworkPacket& NetworkPacket::operator<<(u64 src)
 	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator<<(std::time_t src)
-{
-	*this << (u64) src;
-	return *this;
-}
-
 NetworkPacket& NetworkPacket::operator<<(float src)
 {
 	checkDataSize(4);
@@ -372,16 +366,6 @@ NetworkPacket& NetworkPacket::operator>>(u64& dst)
 	return *this;
 }
 
-NetworkPacket& NetworkPacket::operator>>(std::time_t& dst)
-{
-	checkReadOffset(m_read_offset, 8);
-
-	dst = readU64(&m_data[m_read_offset]);
-
-	m_read_offset += 8;
-	return *this;
-}
-
 NetworkPacket& NetworkPacket::operator>>(float& dst)
 {
 	checkReadOffset(m_read_offset, 4);
diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h
index 760b51f7a..a8b741374 100644
--- a/src/network/networkpacket.h
+++ b/src/network/networkpacket.h
@@ -19,7 +19,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
-#include <ctime>
 #include "util/pointer.h"
 #include "util/numeric.h"
 #include "networkprotocol.h"
@@ -88,9 +87,6 @@ public:
 	NetworkPacket &operator>>(u64 &dst);
 	NetworkPacket &operator<<(u64 src);
 
-	NetworkPacket &operator>>(std::time_t &dst);
-	NetworkPacket &operator<<(std::time_t src);
-
 	NetworkPacket &operator>>(float &dst);
 	NetworkPacket &operator<<(float src);
 
-- 
cgit v1.2.3