Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Requests: Improve more request checks

Browse Source
This commit is contained in:
tt2468 2021-09-25 18:29:27 -07:00
parent d09571f0e3
commit 5350c115bf
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/requesthandler/RequestHandler_General.cpp
View File

@ -79,8 +79,8 @@ RequestResult RequestHandler::TriggerHotkeyByKeySequence(const Request& request)
RequestStatus::RequestStatus statusCode = RequestStatus::NoError; RequestStatus::RequestStatus statusCode = RequestStatus::NoError;
std::string comment; std::string comment;
if (request.RequestData.contains("keyId") && !request.RequestData["keyId"].is_null()) { if (request.Contains("keyId")) {
if (!request.ValidateString("keyId", statusCode, comment)) if (!request.ValidateOptionalString("keyId", statusCode, comment))
return RequestResult::Error(statusCode, comment); return RequestResult::Error(statusCode, comment);
std::string keyId = request.RequestData["keyId"]; std::string keyId = request.RequestData["keyId"];
@ -88,8 +88,8 @@ RequestResult RequestHandler::TriggerHotkeyByKeySequence(const Request& request)
} }
statusCode = RequestStatus::NoError; statusCode = RequestStatus::NoError;
if (request.RequestData.contains("keyModifiers") && !request.RequestData["keyModifiers"].is_null()) { if (request.Contains("keyModifiers")) {
if (!request.ValidateObject("keyModifiers", statusCode, comment, true)) if (!request.ValidateOptionalObject("keyModifiers", statusCode, comment, true))
return RequestResult::Error(statusCode, comment); return RequestResult::Error(statusCode, comment);
const json keyModifiersJson = request.RequestData["keyModifiers"]; const json keyModifiersJson = request.RequestData["keyModifiers"];

5
src/requesthandler/RequestHandler_SceneItems.cpp
View File

@ -68,8 +68,11 @@ RequestResult RequestHandler::CreateSceneItem(const Request& request)
return RequestResult::Error(RequestStatus::CannotAct, "You cannot create scene item of a scene within itself."); return RequestResult::Error(RequestStatus::CannotAct, "You cannot create scene item of a scene within itself.");
bool sceneItemEnabled = true; bool sceneItemEnabled = true;
if (request.RequestData.contains("sceneItemEnabled") && request.RequestData["sceneItemEnabled"].is_boolean()) if (request.Contains("sceneItemEnabled")) {
if (!request.ValidateOptionalBoolean("sceneItemEnabled", statusCode, comment))
return RequestResult::Error(statusCode, comment);
sceneItemEnabled = request.RequestData["sceneItemEnabled"]; sceneItemEnabled = request.RequestData["sceneItemEnabled"];
}
OBSSceneItemAutoRelease sceneItem = Utils::Obs::ActionHelper::CreateSceneItem(source, scene, sceneItemEnabled); OBSSceneItemAutoRelease sceneItem = Utils::Obs::ActionHelper::CreateSceneItem(source, scene, sceneItemEnabled);
if (!sceneItem) if (!sceneItem)