Fix potential defects

Change-Id: Id29b11d467ea34336da912eab85386b3fc2d3b2e

diff --git a/scl/scldebug.cpp b/scl/scldebug.cpp
index 3c60eb2..310fc4b 100644 (file)
--- a/scl/scldebug.cpp
+++ b/scl/scldebug.cpp
@@ -76,7 +76,7 @@ float SCL_DEBUG_ELAPASED_TIME(const char* fileStr, int line, const char* str, in
         gettimeofday(&s_tv2, NULL);
         s_end_line = line;
         char printStr[100];
-        sprintf(printStr, "%s(Line:%d~%d)", str, s_start_line, s_end_line);
+        snprintf(printStr, 100, "%s(Line:%d~%d)", str, s_start_line, s_end_line);
         _SCL_DEBUG_ELAPASED_TIME(printStr, s_tv1, s_tv2);
     }
 }

diff --git a/scl/scleventhandler.cpp b/scl/scleventhandler.cpp
index b9cb5b0..0f280c7 100644 (file)
--- a/scl/scleventhandler.cpp
+++ b/scl/scleventhandler.cpp
@@ -304,7 +304,7 @@ CSCLEventHandler::pre_process_ui_event(SclUIEventDesc &ui_event_desc)
                SCL_ISCHAR range, provide the corresponding ASCII code in key_event field */
             if (ui_event_desc.key_value[0] != '\0' && ui_event_desc.key_value[1] == '\0') {
                 if (SCL_ISCHAR(ui_event_desc.key_value[0])) {
-                    ui_event_desc.key_event = ui_event_desc.key_value[0];
+                    ui_event_desc.key_event = static_cast<sclulong>(ui_event_desc.key_value[0]);
                 }
             }
         } else if (ui_event_desc.key_type == KEY_TYPE_CONTROL) {

diff --git a/xmlresource/layout_parser.cpp b/xmlresource/layout_parser.cpp
index 582d618..b34cca3 100644 (file)
--- a/xmlresource/layout_parser.cpp
+++ b/xmlresource/layout_parser.cpp
@@ -816,12 +816,13 @@ LayoutParserImpl::loading_coordinate_resources(
     int row_y = 0;
     int sub_layout_height = 0;
 
-    SclLayoutKeyCoordinatePointer *cur_key = &m_key_coordinate_pointer_frame[layout_no][0];
+    SclLayoutKeyCoordinatePointer *cur_key = NULL;
 
-    if (scl_check_arrindex_unsigned(layout_no, MAX_SCL_LAYOUT)) {
+    if (scl_check_arrindex(layout_no, MAX_SCL_LAYOUT)) {
         m_num_keys[layout_no] = 0;
+        cur_key = &m_key_coordinate_pointer_frame[layout_no][0];
     }
-    if (*cur_key == NULL) {
+    if (cur_key && *cur_key == NULL) {
         xmlNodePtr child_node = cur_node->xmlChildrenNode;
         while (child_node != NULL) {
             if (0 == xmlStrcmp(child_node->name, (const xmlChar*)LAYOUT_ROW_TAG)) {