Fix deference after null

[platform/core/uifw/stt.git] / client / stt_file.c

diff --git a/client/stt_file.c b/client/stt_file.c
index e1998df..3a36dfe 100644 (file)
--- a/client/stt_file.c
+++ b/client/stt_file.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 Samsung Electronics Co., Ltd All Rights Reserved
+*  Copyright (c) 2011-2016 Samsung Electronics Co., Ltd All Rights Reserved
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
@@ -75,7 +75,7 @@ static const char* __stt_file_get_error_code(stt_file_error_e err)
        }
 }
 
-void __stt_file_engine_info_cb(const char* engine_uuid, const char* engine_name, const char* setting_ug_name, 
+void __stt_file_engine_info_cb(const char* engine_uuid, const char* engine_name, const char* setting_ug_name,
                      bool use_network, void* user_data)
 {
        sttengine_info_s* temp = (sttengine_info_s*)user_data;
@@ -463,9 +463,11 @@ int stt_file_initialize(void)
        if (NULL != engine_id)  free(engine_id);
 
        if (false == is_found) {
+               engine = NULL;
                SLOG(LOG_WARN, TAG_STTFC, "[STT FILE WARNING] Fail to find default engine");
                iter = g_slist_nth(g_engine_list, 0);
-               engine = iter->data;
+               if (NULL != iter)
+                       engine = iter->data;
 
                if (NULL == engine) {
                        SLOG(LOG_ERROR, TAG_STTFC, "[Engine Agent ERROR] Fail to initialize engine");
@@ -563,10 +565,10 @@ int stt_file_get_state(stt_file_state_e* state)
        *state = client->current_state;
 
        switch (*state) {
-               case STT_FILE_STATE_NONE:       SLOG(LOG_DEBUG, TAG_STTFC, "Current state is 'NONE'");          break;
-               case STT_FILE_STATE_READY:      SLOG(LOG_DEBUG, TAG_STTFC, "Current state is 'Ready'");         break;
-               case STT_FILE_STATE_PROCESSING: SLOG(LOG_DEBUG, TAG_STTFC, "Current state is 'Processing'");    break;
-               default:                        SLOG(LOG_ERROR, TAG_STTFC, "[ERROR] Invalid value");            break;
+       case STT_FILE_STATE_NONE:       SLOG(LOG_DEBUG, TAG_STTFC, "Current state is 'NONE'");          break;
+       case STT_FILE_STATE_READY:      SLOG(LOG_DEBUG, TAG_STTFC, "Current state is 'Ready'");         break;
+       case STT_FILE_STATE_PROCESSING: SLOG(LOG_DEBUG, TAG_STTFC, "Current state is 'Processing'");    break;
+       default:                        SLOG(LOG_ERROR, TAG_STTFC, "[ERROR] Invalid value");            break;
        }
 
        return STT_FILE_ERROR_NONE;