Fix null parameter crash

Change-Id: I78f2ff5f852dcc2abf49f3b64220e241bf62663f
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf1a85ccb2418fca116856299b652586b17c7730..039c8ffb9270c8f00578c2074e3a17cef8012dd8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,7 @@ ADD_SUBDIRECTORY(client)
 ## config ##
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/ma-config.xml DESTINATION ${TZ_SYS_RO_SHARE}/multiassistant/ma/1.0)
 
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.multiassistant.maserver.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/services)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.multiassistant.maclient.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/services)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.multiassistant.mauiclient.service DESTINATION ${TZ_SYS_RO_SHARE}/dbus-1/services)
 

diff --git a/client/ma.c b/client/ma.c
index 207880845267f572fbc7bcc617866c544519765d..816d3ec89debd8a447626d2961acff76285196c0 100644 (file)
--- a/client/ma.c
+++ b/client/ma.c
@@ -602,6 +602,11 @@ int ma_get_recording_audio_format(int *rate, ma_audio_channel_e *channel, ma_aud
                return MA_ERROR_PERMISSION_DENIED;
        }
 
+       if (NULL == rate || NULL == channel || NULL == audio_type) {
+               SLOG(LOG_ERROR, TAG_MAC, "[ERROR] Invalid parameter");
+               return MA_ERROR_INVALID_PARAMETER;
+       }
+
        ma_state_e state;
        if (0 != ma_client_get_client_state(g_ma, &state)) {
                SLOG(LOG_ERROR, TAG_MAC, "[ERROR] A handle is not available"); //LCOV_EXCL_LINE
@@ -881,7 +886,7 @@ int ma_send_asr_result(ma_asr_result_event_e event, const char* asr_result)
                return MA_ERROR_PERMISSION_DENIED;
        }
 
-       if (event < MA_ASR_RESULT_EVENT_FINAL_RESULT || event > MA_ASR_RESULT_EVENT_ERROR) {
+       if (event < MA_ASR_RESULT_EVENT_PARTIAL_RESULT || event > MA_ASR_RESULT_EVENT_ERROR) {
                SLOG(LOG_ERROR, TAG_MAC, "[ERROR] Invalid parameter");
                return MA_ERROR_INVALID_PARAMETER;
        }

diff --git a/include/multi_assistant.h b/include/multi_assistant.h
index 8f16f760364cececf2fb4c394bb49ff209c06be8..051b6d2f7aaf9184e015951d909a5720aaee934b 100644 (file)
--- a/include/multi_assistant.h
+++ b/include/multi_assistant.h
@@ -36,8 +36,6 @@ extern "C"
 
 
 
-
-
 /**
  * @brief Initializes multi-assistant client.
  * @since_tizen 5.0

diff --git a/org.tizen.multiassistant.maserver.service b/org.tizen.multiassistant.maserver.service
new file mode 100644 (file)
index 0000000..2e7b4da
--- /dev/null
+++ b/org.tizen.multiassistant.maserver.service
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.tizen.multiassistant.maserver
+#Exec=/usr/bin/vc-daemon
+Exec=/bin/sh -c "launch_app org.tizen.multi-assistant-service"
+#Exec=/bin/sh -c "vc_getengine get system db/voice/vc/engine/default | awk '{print$5}' | xargs -t -i launch_app {}"