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

OBSRemoteProtocol: correctly handling null message IDs

Browse Source
This commit is contained in:
Stéphane Lepin 2020-01-28 17:02:25 +01:00
parent 6c34f00cfe
commit 631452567d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/protocol/OBSRemoteProtocol.cpp
View File

@ -27,11 +27,11 @@ std::string OBSRemoteProtocol::processMessage(WSRequestHandler& requestHandler,
OBSDataAutoRelease data = obs_data_create_from_json(msg); OBSDataAutoRelease data = obs_data_create_from_json(msg);
if (!data) { if (!data) {
blog(LOG_ERROR, "invalid JSON payload received for '%s'", msg); blog(LOG_ERROR, "invalid JSON payload received for '%s'", msg);
return errorResponse(nullptr, "invalid JSON payload"); return errorResponse(QString::Null(), "invalid JSON payload");
} }
if (!obs_data_has_user_value(data, "request-type") || !obs_data_has_user_value(data, "message-id")) { if (!obs_data_has_user_value(data, "request-type") || !obs_data_has_user_value(data, "message-id")) {
return errorResponse(nullptr, "missing request parameters"); return errorResponse(QString::Null(), "missing request parameters");
} }
QString methodName = obs_data_get_string(data, "request-type"); QString methodName = obs_data_get_string(data, "request-type");
@ -58,7 +58,9 @@ std::string OBSRemoteProtocol::processMessage(WSRequestHandler& requestHandler,
std::string OBSRemoteProtocol::buildResponse(QString messageId, QString status, obs_data_t* fields) { std::string OBSRemoteProtocol::buildResponse(QString messageId, QString status, obs_data_t* fields) {
OBSDataAutoRelease response = obs_data_create(); OBSDataAutoRelease response = obs_data_create();
obs_data_set_string(response, "message-id", messageId.toUtf8().constData()); if (!messageId.isNull()) {
obs_data_set_string(response, "message-id", messageId.toUtf8().constData());
}
obs_data_set_string(response, "status", status.toUtf8().constData()); obs_data_set_string(response, "status", status.toUtf8().constData());
if (fields) { if (fields) {