fix: null pointers check

opentibiabr · Mar 12, 2024 · d2b8eb7 · d2b8eb7
1 parent 5ba510d
commit d2b8eb7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/io/iomarket.cpp b/src/io/iomarket.cpp
@@ -55,6 +55,7 @@ MarketOfferList IOMarket::getActiveOffers(MarketAction_t action) {
 	} while (result->next());
 	return offerList;
 }
+
 MarketOfferList IOMarket::getActiveOffers(MarketAction_t action, uint16_t itemId, uint8_t tier) {
 	MarketOfferList offerList;
 

diff --git a/src/server/network/connection/connection.cpp b/src/server/network/connection/connection.cpp
@@ -175,7 +175,9 @@ void Connection::parseHeader(const std::error_code &error) {
 	readTimer.cancel();
 
 	if (error) {
-		g_logger().debug("[Connection::parseHeader] - Read error: {}", error.message());
+		if (error != asio::error::operation_aborted && error != asio::error::eof && error != asio::error::connection_reset) {
+			g_logger().debug("[Connection::parseHeader] - Read error: {}", error.message());
+		}
 		close(FORCE_CLOSE);
 		return;
 	} else if (connectionState == CONNECTION_STATE_CLOSED) {

diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
@@ -5921,7 +5921,12 @@ void ProtocolGame::sendRestingStatus(uint8_t protection) {
 	msg.addByte(0xA9);
 	msg.addByte(protection); // 1 / 0
 
-	int32_t dailyStreak = static_cast<int32_t>(player->kv()->scoped("daily-reward")->get("streak")->getNumber());
+	uint8_t dailyStreak = 0;
+	auto dailyRewardKV = player->kv()->scoped("daily-reward")->get("streak");
+	if (dailyRewardKV && dailyRewardKV.has_value()) {
+		dailyStreak = static_cast<uint8_t>(dailyRewardKV->getNumber());
+	}
+
 	msg.addByte(dailyStreak < 2 ? 0 : 1);
 	if (dailyStreak < 2) {
 		msg.addString("Resting Area (no active bonus)", "ProtocolGame::sendRestingStatus - Resting Area (no active bonus)");
@@ -8618,7 +8623,7 @@ void ProtocolGame::sendMonsterPodiumWindow(std::shared_ptr<Item> podium, const P
 }
 
 void ProtocolGame::parseSetMonsterPodium(NetworkMessage &msg) const {
-	if (oldProtocol) {
+	if (!player || oldProtocol) {
 		return;
 	}