Fix memory leak

[platform/core/uifw/inputdelegator.git] / src / w-input-keyboard.cpp

diff --git a/src/w-input-keyboard.cpp b/src/w-input-keyboard.cpp
index ba9a217..5e9ae09 100755 (executable)
--- a/src/w-input-keyboard.cpp
+++ b/src/w-input-keyboard.cpp
@@ -34,9 +34,9 @@ bool input_keyboard_init(app_control_h app_control)
        int ret = -1;
        char *default_text = NULL;
        char *guide_text = NULL;
-       char *return_key_type = "SEND";
+       char *return_key_type = _("IDS_AMEMO_BUTTON_SEND");
        char *max_text_length = NULL;
-       char *cursor_position_set = "0";
+       char *cursor_position_set = NULL;
 
        input_keyboard_deinit();
 
@@ -55,10 +55,12 @@ bool input_keyboard_init(app_control_h app_control)
        ret = app_control_get_extra_data(app_control, "max_text_length", &max_text_length);
        if (ret == APP_CONTROL_ERROR_NONE) {
                g_input_keyboard_data.max_text_length = atoi(max_text_length);
+               free(max_text_length);
        }
        ret = app_control_get_extra_data(app_control, "cursor_position_set", &cursor_position_set);
        if (ret == APP_CONTROL_ERROR_NONE) {
                g_input_keyboard_data.cursor_position_set = atoi(cursor_position_set);
+               free(cursor_position_set);
        }
 
        return true;
@@ -77,7 +79,7 @@ void input_keyboard_deinit(void)
 
        g_input_keyboard_data.default_text = NULL;
        g_input_keyboard_data.guide_text = NULL;
-       g_input_keyboard_data.return_key_type = "SEND";
+       g_input_keyboard_data.return_key_type = _("IDS_AMEMO_BUTTON_SEND");
        g_input_keyboard_data.max_text_length = KEYBOARD_EDITOR_CHAR_COUNT_MAX;
        g_input_keyboard_data.cursor_position_set = 0;
 
@@ -94,7 +96,7 @@ void exit_keyboard()
        }
 
        const char *getText = elm_entry_entry_get(entry);
-       LOGD("button key clicked!! : getText = %s", getText);
+       SECURE_LOGD("button key clicked!! : getText = %s", getText);
 
        char cursorPosition[512];
        snprintf(cursorPosition, sizeof(cursorPosition), "%d", elm_entry_cursor_pos_get(entry));
@@ -125,7 +127,8 @@ static void maxlength_cb(void *data, Evas_Object *obj, void *event_info)
 {
        LOGD("maxlength_cb : size = %d", KEYBOARD_EDITOR_CHAR_COUNT_MAX);
        char text[512];
-       snprintf(text, sizeof(text), _(MAX_TEXT_LENGTH_REACH), g_input_keyboard_data.max_text_length);
+       const char *guide = _(MAX_TEXT_LENGTH_REACH);
+       snprintf(text, sizeof(text), guide, g_input_keyboard_data.max_text_length);
        show_popup_toast((const char *)text, false);
 }