mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-28 18:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash on malformed input when configuring a remote library.

Browse Source
This commit is contained in:
casey langen 2020-10-23 11:01:54 -07:00
parent c6f7faa3cb
commit 001afe6e9a
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/musikcube/app/layout/RemoteLibrarySettingsLayout.cpp
View File

@ -54,7 +54,16 @@ using namespace cursespp;
#define R(x) (x->GetX() + x->GetWidth()) #define R(x) (x->GetX() + x->GetWidth())
static const std::string kArrowSymbol = "> "; constexpr const char* kArrowSymbol = "> ";
static int getIntFromTextInput(TextInput& input, int defaultValue = -1) {
try {
return std::stoi(input.GetText());
}
catch (...) {
return defaultValue;
}
}
static inline int longestStringLength(const std::vector<std::string>&& keys) { static inline int longestStringLength(const std::vector<std::string>&& keys) {
int max = 0; int max = 0;
@ -228,8 +237,8 @@ void RemoteLibrarySettingsLayout::SyncPreferencesAndLayout() {
void RemoteLibrarySettingsLayout::SavePreferences() { void RemoteLibrarySettingsLayout::SavePreferences() {
auto host = this->hostInput->GetText(); auto host = this->hostInput->GetText();
auto wssPort = std::stoi(this->wssPortInput->GetText()); auto wssPort = getIntFromTextInput(*this->wssPortInput, 7905);
auto httpPort = std::stoi(this->httpPortInput->GetText()); auto httpPort = getIntFromTextInput(*this->httpPortInput, 7906);
auto password = this->pwInput->GetText(); auto password = this->pwInput->GetText();
auto const wssTls = this->wssTlsCheckbox->IsChecked(); auto const wssTls = this->wssTlsCheckbox->IsChecked();
auto const httpTls = this->httpTlsCheckbox->IsChecked(); auto const httpTls = this->httpTlsCheckbox->IsChecked();

2
src/plugins/server/HttpServer.cpp
View File

@ -565,7 +565,7 @@ int HttpServer::HandleAudioTrackRequest(
#endif #endif
if (response) { if (response) {
/* 'format' will be valid if we're transocding. otherwise, extract the extension /* 'format' will be valid if we're transcoding. otherwise, extract the extension
from the filename. the client can use this as a hint when naming downloaded files */ from the filename. the client can use this as a hint when naming downloaded files */
std::string extension = format.size() ? format : fileExtension(filename); std::string extension = format.size() ? format : fileExtension(filename);
MHD_add_response_header(response, "X-musikcube-File-Extension", extension.c_str()); MHD_add_response_header(response, "X-musikcube-File-Extension", extension.c_str());