From cc5d5e34f9f70a4e58f508c5194443309f86b7d4 Mon Sep 17 00:00:00 2001 From: Michal Michalski Date: Fri, 27 Sep 2019 12:48:45 +0200 Subject: [PATCH] [mediacontroller] Check for errors added. + Result of native call to SendCommand was not checked for failure. This commit adds this validation. + Added return after error occured in AddPlaybackInfoChangeList(). [Verification] All tests pass. Signed-off-by: Michal Michalski Change-Id: I5e7e74faa1c8902f35e45278c7c05778094867c4 --- src/mediacontroller/mediacontroller_api.js | 3 +++ src/mediacontroller/mediacontroller_instance.cc | 1 + 2 files changed, 4 insertions(+) diff --git a/src/mediacontroller/mediacontroller_api.js b/src/mediacontroller/mediacontroller_api.js index 71bfaf61..050802ca 100755 --- a/src/mediacontroller/mediacontroller_api.js +++ b/src/mediacontroller/mediacontroller_api.js @@ -3287,6 +3287,9 @@ MediaControllerServerInfo.prototype.sendCommand = function( var replyListenerId = ReplyCommandListener.addListener(callback); var result = native_.callSync('MediaControllerServerInfo_sendCommand', nativeData); + if (native_.isFailure(result)) { + throw native_.getErrorObject(result); + } ReplyCommandListener.requestIdToListenerId[replyListenerId] = result.requestId; }; diff --git a/src/mediacontroller/mediacontroller_instance.cc b/src/mediacontroller/mediacontroller_instance.cc index 4add4984..268aa288 100644 --- a/src/mediacontroller/mediacontroller_instance.cc +++ b/src/mediacontroller/mediacontroller_instance.cc @@ -1415,6 +1415,7 @@ void MediaControllerInstance::MediaControllerServerInfoAddPlaybackInfoChangeList auto result = client_->SetPlaybackInfoListener(callback); if (!result) { LogAndReportError(result, &out); + return; } ReportSuccess(out); -- 2.34.1