From 631452567d900f453783a25835323871f43f0284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 28 Jan 2020 17:02:25 +0100 Subject: [PATCH] OBSRemoteProtocol: correctly handling null message IDs --- src/protocol/OBSRemoteProtocol.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/protocol/OBSRemoteProtocol.cpp b/src/protocol/OBSRemoteProtocol.cpp index 0e0201d7..f0adb7c1 100644 --- a/src/protocol/OBSRemoteProtocol.cpp +++ b/src/protocol/OBSRemoteProtocol.cpp @@ -27,11 +27,11 @@ std::string OBSRemoteProtocol::processMessage(WSRequestHandler& requestHandler, OBSDataAutoRelease data = obs_data_create_from_json(msg); if (!data) { 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")) { - return errorResponse(nullptr, "missing request parameters"); + return errorResponse(QString::Null(), "missing request parameters"); } 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) { 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()); if (fields) {