Skip to content

Commit

Permalink
Avoid strnlen
Browse files Browse the repository at this point in the history
`strnlen` is not available on some platforms, such as macOS 10.4.
  • Loading branch information
glebm authored and AJenbo committed Nov 15, 2024
1 parent a1bff11 commit 165e37b
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions Source/dvlnet/base_protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "dvlnet/packet.h"
#include "player.h"
#include "utils/log.hpp"
#include "utils/stdcompat/string_view.hpp"

namespace devilution {
namespace net {
Expand Down Expand Up @@ -300,11 +301,16 @@ void base_protocol<P>::recv_decrypted(packet &pkt, endpoint_t sender)
return;
std::vector<std::string> playerNames;
for (size_t i = 0; i < Players.size(); i++) {
std::string playerName;
const char *playerNamePointer = (const char *)(pkt.Info().data() + sizeof(GameData) + (i * PlayerNameLength));
playerName.append(playerNamePointer, strnlen(playerNamePointer, PlayerNameLength));
if (!playerName.empty())
playerNames.push_back(playerName);
string_view playerNameBuffer {
reinterpret_cast<const char *>(pkt.Info().data() + sizeof(GameData) + (i * PlayerNameLength)),
PlayerNameLength
};
if (const size_t nullPos = playerNameBuffer.find('\0'); nullPos != string_view::npos) {
playerNameBuffer.remove_suffix(playerNameBuffer.size() - nullPos);
}
if (!playerNameBuffer.empty()) {
playerNames.emplace_back(playerNameBuffer.data(), playerNameBuffer.size());
}
}
std::string gameName;
size_t gameNameSize = pkt.Info().size() - neededSize;
Expand Down

0 comments on commit 165e37b

Please sign in to comment.