izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add bounds checking on ANNOUNCE rtp options

Browse Source
This commit is contained in:
loki
2019-12-07 13:40:15 +01:00
parent d70d2a5c5e
commit b6bf8a0a48
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
stream.cpp
View File

@@ -393,7 +393,7 @@ void controlThread() {
server.map(packetTypes[IDX_LOSS_STATS], [](const std::string_view &payload) { server.map(packetTypes[IDX_LOSS_STATS], [](const std::string_view &payload) {
session.pingTimeout = std::chrono::steady_clock::now() + config::stream.ping_timeout; session.pingTimeout = std::chrono::steady_clock::now() + config::stream.ping_timeout;
/* std::cout << "type [IDX_LOSS_STATS]"sv << std::endl; std::cout << "type [IDX_LOSS_STATS]"sv << std::endl;
int32_t *stats = (int32_t*)payload.data(); int32_t *stats = (int32_t*)payload.data();
auto count = stats[0]; auto count = stats[0];
@@ -405,7 +405,7 @@ void controlThread() {
std::cout << "loss count since last report [" << count << ']' << std::endl; std::cout << "loss count since last report [" << count << ']' << std::endl;
std::cout << "time in milli since last report [" << t.count() << ']' << std::endl; std::cout << "time in milli since last report [" << t.count() << ']' << std::endl;
std::cout << "last good frame [" << lastGoodFrame << ']' << std::endl; std::cout << "last good frame [" << lastGoodFrame << ']' << std::endl;
std::cout << "---end stats---" << std::endl; */ std::cout << "---end stats---" << std::endl;
}); });
server.map(packetTypes[IDX_INVALIDATE_REF_FRAMES], [](const std::string_view &payload) { server.map(packetTypes[IDX_INVALIDATE_REF_FRAMES], [](const std::string_view &payload) {
@@ -419,6 +419,8 @@ void controlThread() {
std::cout << "firstFrame [" << firstFrame << ']' << std::endl; std::cout << "firstFrame [" << firstFrame << ']' << std::endl;
std::cout << "lastFrame [" << lastFrame << ']' << std::endl; std::cout << "lastFrame [" << lastFrame << ']' << std::endl;
exit(100);
}); });
server.map(packetTypes[IDX_INPUT_DATA], [&input](const std::string_view &payload) mutable { server.map(packetTypes[IDX_INPUT_DATA], [&input](const std::string_view &payload) mutable {
@@ -784,6 +786,8 @@ void cmd_announce(tcp::socket &&sock, msg_t &&req) {
} }
} }
try {
auto &config = session.config; auto &config = session.config;
config.audio.channels = util::from_view(args.at("x-nv-audio.surround.numChannels"sv)); config.audio.channels = util::from_view(args.at("x-nv-audio.surround.numChannels"sv));
config.audio.mask = util::from_view(args.at("x-nv-audio.surround.channelMask"sv)); config.audio.mask = util::from_view(args.at("x-nv-audio.surround.channelMask"sv));
@@ -797,6 +801,15 @@ void cmd_announce(tcp::socket &&sock, msg_t &&req) {
config.monitor.bitrate = util::from_view(args.at("x-nv-video[0].initialBitrateKbps"sv)); config.monitor.bitrate = util::from_view(args.at("x-nv-video[0].initialBitrateKbps"sv));
config.monitor.slicesPerFrame = util::from_view(args.at("x-nv-video[0].videoEncoderSlicesPerFrame"sv)); config.monitor.slicesPerFrame = util::from_view(args.at("x-nv-video[0].videoEncoderSlicesPerFrame"sv));
} catch(std::out_of_range &) {
// This piece of code is reached when for some reason, the payload length received < payload length send
// Not sure if this is an issue with Sunshine or Moonlight or the network
// TODO: find out
respond(sock, &option, 400, "BAD REQUEST", req->sequenceNumber, {});
return;
}
std::copy(std::begin(gcm_key), std::end(gcm_key), std::begin(session.gcm_key)); std::copy(std::begin(gcm_key), std::end(gcm_key), std::begin(session.gcm_key));
std::copy(std::begin(iv), std::end(iv), std::begin(session.iv)); std::copy(std::begin(iv), std::end(iv), std::begin(session.iv));