X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=server%2Fvcd_engine_agent.c;h=cd861bce529fc88c1f23190ed5776e9d25c9aa90;hb=8a3433127b6f72a9f7e1e21b5a34c244b7837b33;hp=1f4c58532ad593bb8b20914231ffc242fe1ed8d6;hpb=fc2ce13ca4b116c29e8e50e1334c69110a1f1fe9;p=platform%2Fcore%2Fuifw%2Fvoice-control.git

diff --git a/server/vcd_engine_agent.c b/server/vcd_engine_agent.c
index 1f4c585..cd861bc 100644
--- a/server/vcd_engine_agent.c
+++ b/server/vcd_engine_agent.c
@@ -105,6 +105,10 @@ int vcd_engine_agent_init()
 		SLOG(LOG_WARN, TAG_VCD, "[Server WARNING] There is No default voice in config");
 		/* Set default voice */
 		g_default_lang = strdup(VC_BASE_LANGUAGE);
+		if (NULL == g_default_lang) {
+			SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent] Fail to allocate memory");
+			return VCD_ERROR_OUT_OF_MEMORY;
+		}
 	}
 
 	SLOG(LOG_DEBUG, TAG_VCD, "[Engine Agent SUCCESS] Engine Agent Initialize");
@@ -120,7 +124,10 @@ int vcd_engine_agent_release()
 	}
 
 	/* unload current engine */
-	vcd_engine_agent_unload_current_engine();
+	if (0 != vcd_engine_agent_unload_current_engine()) {
+		SLOG(LOG_ERROR, TAG_VCD, "[Engine Agent ERROR] Fail to deinitialize");
+		return VCD_ERROR_OPERATION_FAILED;
+	}
 
 	/* release current engine data */
 	if (NULL != g_dynamic_engine.callbacks) {