Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpinet] WebSocketSerializer: Fix UB (#5787)

Browse Source
This commit is contained in:
Peter Johnson
2023-10-19 00:14:23 -07:00
committed by GitHub
parent 244163acad
commit 85147bf69e
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wpinet/src/main/native/cpp/WebSocketSerializer.h
View File

@@ -179,7 +179,13 @@ std::span<const WebSocket::Frame> TrySendFrames(
bufs.append(it->data.begin(), it->data.end());
}
callback(bufs, {});
return {&*frameStart, &*frameEnd};
#ifdef __clang__
// work around clang bug
return {frames.data() + (frameStart - frames.begin()),
frames.data() + (frameEnd - frames.begin())};
#else
return {frameStart, frameEnd};
#endif
} else if (sentBytes < 0) {
// error
SmallVector<uv::Buffer, 4> bufs;
@@ -208,7 +214,13 @@ std::span<const WebSocket::Frame> TrySendFrames(
bufs.append(it->data.begin(), it->data.end());
}
callback(bufs, {});
return {&*frameStart, &*frameEnd};
#ifdef __clang__
// work around clang bug
return {frames.data() + (frameStart - frames.begin()),
frames.data() + (frameEnd - frames.begin())};
#else
return {frameStart, frameEnd};
#endif
}
// build a list of buffers to send as a normal write:
@@ -270,7 +282,13 @@ std::span<const WebSocket::Frame> TrySendFrames(
WS_DEBUG("Write({})\n", writeBufs.size());
stream.Write(writeBufs, req);
return {&*frameStart, &*frameEnd};
#ifdef __clang__
// work around clang bug
return {frames.data() + (frameStart - frames.begin()),
frames.data() + (frameEnd - frames.begin())};
#else
return {frameStart, frameEnd};
#endif
}
}