Send INVALID_DATA in case SubMenuIcon is invalid

1 files changed, 6 insertions, 5 deletions

diff --git a/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc b/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc
index 51be5d8d1b..715f7a64e9 100644
--- a/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc
+++ b/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc
@@ -95,8 +95,12 @@ void AddSubMenuRequest::Run() {
       (*message_)[strings::msg_params][strings::menu_name];
   msg_params[strings::app_id] = app->app_id();
 
-  if (((*message_)[strings::msg_params].keyExists(strings::sub_menu_icon)) &&
-      CheckSubMenuIcon()) {
+  if (((*message_)[strings::msg_params].keyExists(strings::sub_menu_icon))) {
+    if (!CheckSubMenuIcon()) {
+      LOG4CXX_ERROR(logger_, "Sub-menu icon is not valid.");
+      SendResponse(false, mobile_apis::Result::INVALID_DATA);
+      return;
+    }
     msg_params[strings::sub_menu_icon] =
         (*message_)[strings::msg_params][strings::sub_menu_icon];
   }
@@ -163,9 +167,6 @@ bool AddSubMenuRequest::CheckSubMenuName() {
 }
 
 bool AddSubMenuRequest::CheckSubMenuIcon() {
-  if (!(*message_)[strings::msg_params].keyExists(strings::sub_menu_icon)) {
-    return false;
-  }
   const std::string str =
       (*message_)[strings::msg_params][strings::sub_menu_icon][strings::value]
           .asString();