[Title] convert sprintf to snprintf & update err table

[Type]
[Module] Emulator
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/oslib-posix.c b/oslib-posix.c
index 1f3b0d1031a72c9d9859f3c15b5eac95468cbff9..bef0be15a17a48cafe4ce0fc3a9ff51fe64706ed 100644 (file)
--- a/oslib-posix.c
+++ b/oslib-posix.c
@@ -74,7 +74,15 @@ void *qemu_oom_check(void *ptr)
 #ifdef CONFIG_MARU
         char _msg[] = "Failed to allocate memory in qemu.";
         char cmd[JAVA_MAX_COMMAND_LENGTH] = { 0, };
-        sprintf(cmd, "%s %s %s %s=\"%s\"", JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH, "simple.msg", _msg);
+
+        int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) + strlen(JAR_SKINFILE_PATH) +
+            strlen(JAVA_SIMPLEMODE_OPTION) + strlen(_msg) + 7;
+        if (len > JAVA_MAX_COMMAND_LENGTH) {
+            len = JAVA_MAX_COMMAND_LENGTH;
+        }
+
+        snprintf(cmd, len, "%s %s %s %s=\"%s\"",
+            JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH, JAVA_SIMPLEMODE_OPTION, _msg);
         int ret = system(cmd);
 #endif
 

diff --git a/oslib-win32.c b/oslib-win32.c
index 1f6d85362344826450b432077705683862e29936..30ce4c93958cf993f979ad65ce813e2bd5587b22 100644 (file)
--- a/oslib-win32.c
+++ b/oslib-win32.c
@@ -43,11 +43,18 @@ void *qemu_oom_check(void *ptr)
 #ifdef CONFIG_MARU
         char _msg[] = "Failed to allocate memory in qemu.";
         char cmd[JAVA_MAX_COMMAND_LENGTH] = { 0, };
-        sprintf(cmd, "%s %s %s %s=\"%s\"", JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH, "simple.msg", _msg);
+
+        int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) + strlen(JAR_SKINFILE_PATH) +
+           strlen(JAVA_SIMPLEMODE_OPTION) + strlen(_msg) + 7;
+        if (len > JAVA_MAX_COMMAND_LENGTH) {
+            len = JAVA_MAX_COMMAND_LENGTH;
+        }
+
+        snprintf(cmd, len, "%s %s %s %s=\"%s\"",
+            JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH, JAVA_SIMPLEMODE_OPTION, _msg);
         int ret = WinExec(cmd, SW_SHOW);
 #endif
 
-
         abort();
     }
     return ptr;

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index 9c15f4f74bdc089b30fda1bec55d05ee09225c83..e4b00e77c17a8f0e0eebe313cf4414b350a819f0 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -96,6 +96,7 @@ static void construct_main_window(int skin_argc, char* skin_argv[], int qemu_arg
 
     if (get_emul_skin_enable() == 1) { //this line is check for debugging, etc..
         if ( 0 > start_skin_client(skin_argc, skin_argv) ) {
+            maru_register_exit_msg(MARU_EXIT_SKIN_SERVER_FAILED, NULL);
             exit( -1 );
         }
     }

diff --git a/tizen/src/maru_err_table.c b/tizen/src/maru_err_table.c
index 2cdee546f4089384097821a1e4212013135a44cd..66c9d8993198d79e4546bc0a07f36af6d249f46b 100644 (file)
--- a/tizen/src/maru_err_table.c
+++ b/tizen/src/maru_err_table.c
@@ -39,6 +39,7 @@ static char _maru_string_table[][JAVA_MAX_COMMAND_LENGTH] = {
     /* 1 */ "Failed to allocate memory in qemu.", //MARU_EXIT_MEMORY_EXCEPTION
     /* 2 */ "Fail to load kernel file. Check if the file is corrupted or missing from the following path.\n\n", //MARU_EXIT_KERNEL_FILE_EXCEPTION
     /* 3 */ "Fail to load bios file. Check if the file is corrupted or missing from the following path.\n\n", //MARU_EXIT_BIOS_FILE_EXCEPTION
+    /* 4 */ "Skin process cannot be initialized. Skin server is not ready.",
     /* add here.. */
     "" //MARU_EXIT_NORMAL
 };
@@ -58,13 +59,22 @@ void maru_register_exit_msg(int maru_exit_index, char* additional_msg)
     maru_exit_status = maru_exit_index;
 
     if (maru_exit_status != MARU_EXIT_UNKNOWN) {
-        len = strlen(_maru_string_table[maru_exit_status]) + strlen(additional_msg) + 1;
-        if (len >= JAVA_MAX_COMMAND_LENGTH) {
-            len = JAVA_MAX_COMMAND_LENGTH;
-        }
+        if (additional_msg != NULL) {
+            len = strlen(_maru_string_table[maru_exit_status]) + strlen(additional_msg) + 1;
+            if (len > JAVA_MAX_COMMAND_LENGTH) {
+                len = JAVA_MAX_COMMAND_LENGTH;
+            }
 
-        snprintf(maru_exit_msg, len, "%s%s", _maru_string_table[maru_exit_status], additional_msg);
-    } else {
+            snprintf(maru_exit_msg, len, "%s%s", _maru_string_table[maru_exit_status], additional_msg);
+        } else {
+            len = strlen(_maru_string_table[maru_exit_status]) + 1;
+            if (len > JAVA_MAX_COMMAND_LENGTH) {
+                len = JAVA_MAX_COMMAND_LENGTH;
+            }
+
+            snprintf(maru_exit_msg, len, "%s", _maru_string_table[maru_exit_status]);
+        }
+    } else if (additional_msg != NULL) {
         len = strlen(additional_msg);
         if (len >= JAVA_MAX_COMMAND_LENGTH) {
             additional_msg[JAVA_MAX_COMMAND_LENGTH - 1] = '\0';

diff --git a/tizen/src/maru_err_table.h b/tizen/src/maru_err_table.h
index 55254450da903e877c4a30ad31f15ab3d6a7c11c..3a25de63c9428e81c4c55dffc4af790768033828 100644 (file)
--- a/tizen/src/maru_err_table.h
+++ b/tizen/src/maru_err_table.h
@@ -41,6 +41,7 @@ enum { //This enum must match the table definition
     /* 1 */ MARU_EXIT_MEMORY_EXCEPTION,
     /* 2 */ MARU_EXIT_KERNEL_FILE_EXCEPTION,
     /* 3 */ MARU_EXIT_BIOS_FILE_EXCEPTION,
+    /* 4 */ MARU_EXIT_SKIN_SERVER_FAILED,
     /* add here.. */
     MARU_EXIT_NORMAL
 };

diff --git a/tizen/src/skin/maruskin_client.c b/tizen/src/skin/maruskin_client.c
index 101822e3ed344f33004040a6996614af9acba9fb..ac6ee8d9cdd65fd18ff5eaf97e8565ca79f022a5 100644 (file)
--- a/tizen/src/skin/maruskin_client.c
+++ b/tizen/src/skin/maruskin_client.c
@@ -80,7 +80,24 @@ static void* run_skin_client(void* arg)
     char* vm_path = tizen_target_path;
     //INFO( "vm_path:%s\n", vm_path );
 
-    sprintf( cmd, "%s %s %s %s=\"%d\" %s=\"%d\" %s=\"%s\" %s=\"%d\" %s", JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH,
+    char buf_skin_server_port[16];
+    char buf_uid[16];
+    char buf_tizen_base_port[16];
+    sprintf(buf_skin_server_port, "%d", skin_server_port);
+    sprintf(buf_uid, "%d", uid);
+    sprintf(buf_tizen_base_port, "%d", tizen_base_port);
+
+    int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) + strlen(JAR_SKINFILE_PATH) +
+        strlen(OPT_SVR_PORT) + strlen(buf_skin_server_port) + strlen(OPT_UID) + strlen(buf_uid) +
+        strlen(OPT_VM_PATH) + strlen(vm_path) + strlen(OPT_NET_BASE_PORT) + strlen(buf_tizen_base_port) +
+        strlen(argv) + 20;
+    if (len > JAVA_MAX_COMMAND_LENGTH) {
+        INFO("swt command length is too long! (%d)\n", len);
+        len = JAVA_MAX_COMMAND_LENGTH;
+    }
+
+    snprintf( cmd, len, "%s %s %s %s=\"%d\" %s=\"%d\" %s=\"%s\" %s=\"%d\" %s",
+        JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH,
         OPT_SVR_PORT, skin_server_port,
         OPT_UID, uid,
         OPT_VM_PATH, vm_path,
@@ -104,7 +121,9 @@ static void* run_skin_client(void* arg)
                           &sti,
                           &pi))
         {
-            ERR("Unable to generate process!error %u\n", GetLastError());
+            ERR("Unable to generate process! error %u\n", GetLastError());
+            maru_register_exit_msg(MARU_EXIT_UNKNOWN,
+                "CreateProcess function failed. Unable to generate process.");
             exit(1);
         }
 
@@ -220,7 +239,13 @@ int start_simple_client(char* msg) {
 
     INFO("run simple client\n");
 
-    sprintf(cmd, "%s %s %s %s=\"%s\"", JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH, "simple.msg", msg);
+    int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) + strlen(JAR_SKINFILE_PATH) +
+        strlen(JAVA_SIMPLEMODE_OPTION) + strlen(msg) + 7;
+    if (len > JAVA_MAX_COMMAND_LENGTH) {
+        len = JAVA_MAX_COMMAND_LENGTH;
+    }
+
+    snprintf(cmd, len, "%s %s %s %s=\"%s\"", JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH, JAVA_SIMPLEMODE_OPTION, msg);
     INFO("command for swt : %s\n", cmd);
 
 #ifdef __WIN32

diff --git a/tizen/src/skin/maruskin_client.h b/tizen/src/skin/maruskin_client.h
index fb3621cbef40ff8f2e659941c30a38e00c50b1bc..4ebb9003178fc9e534ef27af86f2c99fc99df13d 100644 (file)
--- a/tizen/src/skin/maruskin_client.h
+++ b/tizen/src/skin/maruskin_client.h
@@ -35,10 +35,10 @@
 #define JAR_SKINFILE_PATH "emulator-skin.jar"
 #define JAVA_EXEFILE_PATH "java"
 #define JAVA_EXEOPTION "-jar"
+#define JAVA_SIMPLEMODE_OPTION "simple.msg"
 
 
 int start_skin_client(int argc, char* argv[]);
 int start_simple_client(char* msg);
 
-
 #endif /* MARUSKIN_CLIENT_H_ */