From: dyamy-lee Date: Wed, 18 Nov 2020 07:16:04 +0000 (+0900) Subject: rw-update-ani-common : hot fix - target linking missing DSO X-Git-Tag: submit/tizen_6.0/20210611.044034~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F250241%2F1;p=profile%2Fcommon%2Fapps%2Fnative%2Ffirmware-update-system-ui.git rw-update-ani-common : hot fix - target linking missing DSO fota_gui_common, recovery_gui_common, rw-update-ani-common : if using rotate_angle, rotate_state from input, it has to consider integer overflow Change-Id: Ib09725bdae947576e2b5f79195ea0c0323db6b70 --- diff --git a/fota_gui_common/fota_gr_direct_ro_common.c b/fota_gui_common/fota_gr_direct_ro_common.c index 2169cd5..8b3ebb5 100644 --- a/fota_gui_common/fota_gr_direct_ro_common.c +++ b/fota_gui_common/fota_gr_direct_ro_common.c @@ -634,9 +634,13 @@ void _get_rotate(void) rotate_angle = atoi(rotate_state); } + if(rotate_angle < -360 || rotate_angle > 360) // for prevent interger overflow + rotate_angle = 0; LOG("Print Rotate Angle value = %d\n", rotate_angle); rotate_step = (rotate_angle + 360) / 90 % 4; + if(rotate_step < 0 || rotate_step > 4) // for prevent interger overflow + rotate_step = 0; rollback_step = (4 - rotate_step) % 4; LOG("rotate_step = %d, rollback_step = %d\n", rotate_step, rollback_step); diff --git a/recovery_gui_common/recovery_gr_direct_common.c b/recovery_gui_common/recovery_gr_direct_common.c index 021ae2c..1e62197 100644 --- a/recovery_gui_common/recovery_gr_direct_common.c +++ b/recovery_gui_common/recovery_gr_direct_common.c @@ -627,9 +627,13 @@ void _get_rotate(void) rotate_angle = atoi(rotate_state); } + if(rotate_angle < -360 || rotate_angle > 360) // for prevent interger overflow + rotate_angle = 0; LOG("Print Rotate Angle value = %d\n", rotate_angle); rotate_step = (rotate_angle + 360) / 90 % 4; + if(rotate_step < 0 || rotate_step > 4) // for prevent interger overflow + rotate_step = 0; rollback_step = (4 - rotate_step) % 4; LOG("rotate_step = %d, rollback_step = %d\n", rotate_step, rollback_step); diff --git a/rw-update-ani-common/CMakeLists.txt b/rw-update-ani-common/CMakeLists.txt index 1a6d7b7..6ed7f88 100644 --- a/rw-update-ani-common/CMakeLists.txt +++ b/rw-update-ani-common/CMakeLists.txt @@ -57,7 +57,7 @@ ENDIF("${ARCH}" STREQUAL "arm") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -pie") ADD_EXECUTABLE(${PROJECT_NAME} ${GUI_SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${gui_pkgs_LDFLAGS} ${LIBS} -lpthread) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_ani_LDFLAGS} ${LIBS} -lpthread) ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"") ADD_DEFINITIONS("-DROTATE=0") diff --git a/rw-update-ani-common/fota_gr_direct_rw_common.c b/rw-update-ani-common/fota_gr_direct_rw_common.c index 9cba1b2..901bf25 100644 --- a/rw-update-ani-common/fota_gr_direct_rw_common.c +++ b/rw-update-ani-common/fota_gr_direct_rw_common.c @@ -645,9 +645,13 @@ void _get_rotate(void) rotate_angle = atoi(rotate_state); } + if(rotate_angle < -360 || rotate_angle > 360) // for prevent interger overflow + rotate_angle = 0; LOG("Print Rotate Angle value = %d\n", rotate_angle); rotate_step = (rotate_angle + 360) / 90 % 4; + if(rotate_step < 0 || rotate_step > 4) // for prevent interger overflow + rotate_step = 0; rollback_step = (4 - rotate_step) % 4; LOG("rotate_step = %d, rollback_step = %d\n", rotate_step, rollback_step);