Skip to content

Fix compile error with latest Appleclang #1643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slipher merged 1 commit into from
May 1, 2025
Merged

Fix compile error with latest Appleclang #1643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/engine/framework/Network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,18 @@ void OutOfBandData( netsrc_t sock, const netadr_t& adr, byte *data, std::size_t
return;
}

std::basic_string<byte> message;
message.reserve(OOBHeader().size() + len);
message.append(OOBHeader().begin(), OOBHeader().end());
message.append(data, len);
byte buf[MAX_MSGLEN]; // TODO should this be shorter, like MAX_PACKET?
size_t size = OOBHeader().size() + len;
if (size > sizeof(buf)) {
Log::Warn("OutOfBandData: not sending excessively large (%d) message", len);
return;
}
std::copy_n(OOBHeader().begin(), OOBHeader().size(), buf);
std::copy_n(data, len, buf + OOBHeader().size());

msg_t mbuf;
mbuf.data = &message[0];
mbuf.cursize = message.size();
msg_t mbuf{};
mbuf.data = buf;
mbuf.cursize = size;
Huff_Compress( &mbuf, 12 );
// send the datagram
NET_SendPacket( sock, mbuf.cursize, mbuf.data, adr );
Expand Down