From: Myung Jin Kim Date: Tue, 13 Aug 2013 07:00:26 +0000 (+0900) Subject: fix prevent for INT_MAX X-Git-Tag: accepted/tizen/20131002.165803^2~445^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fef0e427bdbab765f452dc917cdac09b5041313;p=platform%2Fframework%2Fnative%2Fuifw.git fix prevent for INT_MAX Change-Id: I7313680b05de4e282a5ee49009b57a737c9b7598 --- diff --git a/src/ui/controls/FUiCtrlButtonItem.cpp b/src/ui/controls/FUiCtrlButtonItem.cpp index 31cb61a..2caeba4 100644 --- a/src/ui/controls/FUiCtrlButtonItem.cpp +++ b/src/ui/controls/FUiCtrlButtonItem.cpp @@ -46,7 +46,7 @@ ButtonItem::Construct(ButtonItemStyle style, int actionId) { result r = E_SUCCESS; - SysTryReturnResult(NID_UI_CTRL, (actionId >= BUTTON_ITEM_ACTION_ID_MIN && actionId <= BUTTON_ITEM_ACTION_ID_MAX), E_INVALID_ARG, + SysTryReturnResult(NID_UI_CTRL, actionId >= BUTTON_ITEM_ACTION_ID_MIN, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); _ButtonItemImpl* pImpl = _ButtonItemImpl::GetInstance(*this); diff --git a/src/ui/controls/FUiCtrlFooterItem.cpp b/src/ui/controls/FUiCtrlFooterItem.cpp index a8ba704..c5d54cf 100644 --- a/src/ui/controls/FUiCtrlFooterItem.cpp +++ b/src/ui/controls/FUiCtrlFooterItem.cpp @@ -49,7 +49,7 @@ FooterItem::Construct(int actionId) { result r = E_SUCCESS; - SysTryReturnResult(NID_UI_CTRL, (actionId >= FOOTER_ITEM_ACTION_ID_MIN && actionId <= FOOTER_ITEM_ACTION_ID_MAX), E_INVALID_ARG, + SysTryReturnResult(NID_UI_CTRL, actionId >= FOOTER_ITEM_ACTION_ID_MIN, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); _FooterItemImpl* pImpl = _FooterItemImpl::GetInstance(*this); diff --git a/src/ui/controls/FUiCtrlHeaderItem.cpp b/src/ui/controls/FUiCtrlHeaderItem.cpp index a5cae55..3219955 100644 --- a/src/ui/controls/FUiCtrlHeaderItem.cpp +++ b/src/ui/controls/FUiCtrlHeaderItem.cpp @@ -49,7 +49,7 @@ HeaderItem::Construct(int actionId) { result r = E_SUCCESS; - SysTryReturnResult(NID_UI_CTRL, (actionId >= HEADER_ITEM_ACTION_ID_MIN && actionId <= HEADER_ITEM_ACTION_ID_MAX), E_INVALID_ARG, + SysTryReturnResult(NID_UI_CTRL, actionId >= HEADER_ITEM_ACTION_ID_MIN, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); _HeaderItemImpl* pImpl = _HeaderItemImpl::GetInstance(*this); diff --git a/src/ui/controls/FUiCtrl_ButtonItemImpl.cpp b/src/ui/controls/FUiCtrl_ButtonItemImpl.cpp index b415296..2c05c76 100644 --- a/src/ui/controls/FUiCtrl_ButtonItemImpl.cpp +++ b/src/ui/controls/FUiCtrl_ButtonItemImpl.cpp @@ -62,7 +62,7 @@ _ButtonItemImpl::GetInstance(ButtonItem& buttonItem) result _ButtonItemImpl::Construct(ButtonItemStyle style, int actionId) { - SysTryReturnResult(NID_UI_CTRL, (actionId >= BUTTON_ITEM_ACTION_ID_MIN && actionId <= BUTTON_ITEM_ACTION_ID_MAX), + SysTryReturnResult(NID_UI_CTRL, actionId >= BUTTON_ITEM_ACTION_ID_MIN, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); __actionId = actionId; @@ -120,7 +120,7 @@ _ButtonItemImpl::GetText(void) const result _ButtonItemImpl::SetActionId(int actionId) { - SysTryReturnResult(NID_UI_CTRL, (actionId > BUTTON_ITEM_ACTION_ID_MIN && actionId < BUTTON_ITEM_ACTION_ID_MAX), + SysTryReturnResult(NID_UI_CTRL, actionId > BUTTON_ITEM_ACTION_ID_MIN, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); __actionId = actionId; diff --git a/src/ui/controls/FUiCtrl_FooterImpl.cpp b/src/ui/controls/FUiCtrl_FooterImpl.cpp index 51031cd..edaad4d 100644 --- a/src/ui/controls/FUiCtrl_FooterImpl.cpp +++ b/src/ui/controls/FUiCtrl_FooterImpl.cpp @@ -144,8 +144,8 @@ _FooterImpl::AddItem(const FooterItem& item) SysTryReturnResult(NID_UI_CTRL, (__style >= FOOTER_STYLE_BUTTON_TEXT && __style <= FOOTER_MAX_STATE_COUNT), E_INVALID_OPERATION, "[E_INVALID_OPERATION] Current Footer style doesn't support this operation."); - SysTryReturnResult(NID_UI_CTRL, (item.GetActionId() <= FOOTER_ITEM_ACTION_ID_MAX && item.GetActionId() >= FOOTER_ACTION_ID_MIN), - E_INVALID_ARG, "[E_INVALID_ARG] The item isn't constructed."); + SysTryReturnResult(NID_UI_CTRL, item.GetActionId() >= FOOTER_ACTION_ID_MIN, + E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); result r = CheckItemValidate(item); @@ -383,7 +383,7 @@ _FooterImpl::SetButton(ButtonPosition position, const ButtonItem& button) SysTryReturnResult(NID_UI_CTRL, !(__style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE), E_UNSUPPORTED_OPERATION, "[E_UNSUPPORTED_OPERATION] Unable to set the button item because the current style does not support it."); - SysTryReturnResult(NID_UI_CTRL, (button.GetActionId() >= FOOTER_ACTION_ID_MIN && button.GetActionId() <= FOOTER_ACTION_ID_MAX), + SysTryReturnResult(NID_UI_CTRL, button.GetActionId() >= FOOTER_ACTION_ID_MIN, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); int count = GetItemCount(); @@ -439,7 +439,7 @@ _FooterImpl::SetItemAt(int itemIndex, const FooterItem& item) { SysTryReturnResult(NID_UI_CTRL, (item.GetActionId() != -1), E_INVALID_ARG, "[E_INVALID_ARG] The FooterItem isn't constructed."); - if (item.GetActionId() < FOOTER_ACTION_ID_MIN || item.GetActionId() > FOOTER_ACTION_ID_MAX) + if (item.GetActionId() < FOOTER_ACTION_ID_MIN) { SysLogException(NID_UI_CTRL, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); return E_INVALID_ARG; @@ -764,7 +764,7 @@ _FooterImpl::CheckItemValidate(const FooterItem& item) "[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit."); } - if (item.GetActionId() < FOOTER_ACTION_ID_MIN || item.GetActionId() > FOOTER_ACTION_ID_MAX) + if (item.GetActionId() < FOOTER_ACTION_ID_MIN) { SysLogException(NID_UI_CTRL, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); return E_INVALID_ARG; diff --git a/src/ui/controls/FUiCtrl_FooterItemImpl.cpp b/src/ui/controls/FUiCtrl_FooterItemImpl.cpp index f52fabd..380ea1d 100644 --- a/src/ui/controls/FUiCtrl_FooterItemImpl.cpp +++ b/src/ui/controls/FUiCtrl_FooterItemImpl.cpp @@ -64,7 +64,7 @@ _FooterItemImpl::GetInstance(FooterItem& footerItem) result _FooterItemImpl::Construct(int actionId) { - SysTryReturnResult(NID_UI_CTRL, (actionId >= FOOTER_ITEM_ACTION_ID_MIN && actionId <= FOOTER_ITEM_ACTION_ID_MAX), + SysTryReturnResult(NID_UI_CTRL, actionId >= FOOTER_ITEM_ACTION_ID_MIN, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); __actionId = actionId; @@ -120,7 +120,7 @@ _FooterItemImpl::GetText(void) const result _FooterItemImpl::SetActionId(int actionId) { - SysTryReturnResult(NID_UI_CTRL, (actionId >= FOOTER_ITEM_ACTION_ID_MIN && actionId <= FOOTER_ITEM_ACTION_ID_MAX), + SysTryReturnResult(NID_UI_CTRL, actionId >= FOOTER_ITEM_ACTION_ID_MIN, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); __actionId = actionId; diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp index f8159b9..5c9db8c 100644 --- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp +++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp @@ -148,6 +148,9 @@ _HeaderImpl::AddItem(const HeaderItem& item) { SysTryReturnResult(NID_UI_CTRL, (__style != HEADER_STYLE_TITLE), E_SYSTEM, "[E_SYSTEM] Unable to add the item because the current style does not support it."); + SysTryReturnResult(NID_UI_CTRL, item.GetActionId() >= HEADER_ACTION_ID_MIN, + E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); + result r = CheckItemValidate(item); if (IsFailed(r)) @@ -518,7 +521,7 @@ _HeaderImpl::SetButton(ButtonPosition position, const ButtonItem& button) SysTryReturnResult(NID_UI_CTRL, (!(__style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_LARGE)), E_INVALID_OPERATION, "[E_INVALID_OPERATION] This operation is not supported."); - SysTryReturnResult(NID_UI_CTRL, (button.GetActionId() >= HEADER_ACTION_ID_MIN && button.GetActionId() <= HEADER_ACTION_ID_MAX), + SysTryReturnResult(NID_UI_CTRL, button.GetActionId() >= HEADER_ACTION_ID_MIN, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); int count = GetItemCount(); @@ -632,7 +635,7 @@ _HeaderImpl::SetItemAt(int itemIndex, const HeaderItem& item) { SysTryReturnResult(NID_UI_CTRL, (item.GetActionId() != -1), E_INVALID_ARG, "[E_INVALID_ARG] The HeaderItem isn't constructed."); - if (item.GetActionId() < HEADER_ACTION_ID_MIN || item.GetActionId() > HEADER_ACTION_ID_MAX) + if (item.GetActionId() < HEADER_ACTION_ID_MIN) { SysLogException(NID_UI_CTRL, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); return E_INVALID_ARG; @@ -1024,7 +1027,7 @@ _HeaderImpl::CheckItemValidate(const HeaderItem& item) goto CATCH; } - if (item.GetActionId() < HEADER_ACTION_ID_MIN || item.GetActionId() > HEADER_ACTION_ID_MAX) + if (item.GetActionId() < HEADER_ACTION_ID_MIN) { SysLogException(NID_UI_CTRL, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); r = E_INVALID_ARG; diff --git a/src/ui/controls/FUiCtrl_HeaderItemImpl.cpp b/src/ui/controls/FUiCtrl_HeaderItemImpl.cpp index 7970c24..fb0b383 100644 --- a/src/ui/controls/FUiCtrl_HeaderItemImpl.cpp +++ b/src/ui/controls/FUiCtrl_HeaderItemImpl.cpp @@ -64,7 +64,7 @@ _HeaderItemImpl::GetInstance(HeaderItem& headerItem) result _HeaderItemImpl::Construct(int actionId) { - SysTryReturnResult(NID_UI_CTRL, (actionId >= HEADER_ITEM_ACTION_ID_MIN && actionId <= HEADER_ITEM_ACTION_ID_MAX), + SysTryReturnResult(NID_UI_CTRL, actionId >= HEADER_ITEM_ACTION_ID_MIN, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); __actionId = actionId; @@ -120,7 +120,7 @@ _HeaderItemImpl::GetText(void) const result _HeaderItemImpl::SetActionId(int actionId) { - SysTryReturnResult(NID_UI_CTRL, (actionId >= HEADER_ITEM_ACTION_ID_MIN && actionId <= HEADER_ITEM_ACTION_ID_MAX), + SysTryReturnResult(NID_UI_CTRL, actionId >= HEADER_ITEM_ACTION_ID_MIN, E_INVALID_ARG, "[E_INVALID_ARG] The actionId is invalid."); __actionId = actionId; diff --git a/src/ui/inc/FUiCtrl_ButtonItemImpl.h b/src/ui/inc/FUiCtrl_ButtonItemImpl.h index 6f971af..b4a9593 100644 --- a/src/ui/inc/FUiCtrl_ButtonItemImpl.h +++ b/src/ui/inc/FUiCtrl_ButtonItemImpl.h @@ -32,7 +32,6 @@ namespace Tizen { namespace Ui { namespace Controls { static const int BUTTON_ITEM_ACTION_ID_MIN = 0; -static const int BUTTON_ITEM_ACTION_ID_MAX = INT_MAX; static const int BUTTON_ITEM_MAX_STATE_COUNT = 4; class _ButtonItemImpl diff --git a/src/ui/inc/FUiCtrl_FooterImpl.h b/src/ui/inc/FUiCtrl_FooterImpl.h index 1d2ce55..5007746 100644 --- a/src/ui/inc/FUiCtrl_FooterImpl.h +++ b/src/ui/inc/FUiCtrl_FooterImpl.h @@ -42,7 +42,6 @@ const int FOOTER_MAX_ITEM_COUNT_WITH_BUTTON = 3; const int FOOTER_BUTTON_MAX_COUNT = 3; const int FOOTER_ITEM_MAX_COUNT = 15; const int FOOTER_ACTION_ID_MIN = 0; -const int FOOTER_ACTION_ID_MAX = INT_MAX; const int FOOTER_NUMBERD_BADGE_ICON_NUMBER_MAX = 99999; class _FooterImpl diff --git a/src/ui/inc/FUiCtrl_FooterItemImpl.h b/src/ui/inc/FUiCtrl_FooterItemImpl.h index b59d528..a77d2e7 100644 --- a/src/ui/inc/FUiCtrl_FooterItemImpl.h +++ b/src/ui/inc/FUiCtrl_FooterItemImpl.h @@ -32,7 +32,6 @@ namespace Tizen { namespace Ui { namespace Controls { static const int FOOTER_ITEM_ACTION_ID_MIN = 0; -static const int FOOTER_ITEM_ACTION_ID_MAX = INT_MAX; static const int FOOTER_ITEM_MAX_STATE_COUNT = 5; class _FooterItemImpl diff --git a/src/ui/inc/FUiCtrl_HeaderImpl.h b/src/ui/inc/FUiCtrl_HeaderImpl.h index 4947346..6c2881d 100644 --- a/src/ui/inc/FUiCtrl_HeaderImpl.h +++ b/src/ui/inc/FUiCtrl_HeaderImpl.h @@ -42,7 +42,6 @@ const int HEADER_MAX_WAITING_ANIMATION_POSITION = 3; const int HEADER_TITLE_BUTTON_STYLE_MAX_ITEM_COUNT = 1; const int HEADER_TAB_STYLE_MAX_ITEM_COUNT = 15; const int HEADER_ACTION_ID_MIN = 0; -const int HEADER_ACTION_ID_MAX = INT_MAX; const int HEADER_NUMBERD_BADGE_ICON_NUMBER_MAX = 99999; const int HEADER_MORE_BUTTON_ACTION_ID = 500; diff --git a/src/ui/inc/FUiCtrl_HeaderItemImpl.h b/src/ui/inc/FUiCtrl_HeaderItemImpl.h index f39ef26..76d2f04 100644 --- a/src/ui/inc/FUiCtrl_HeaderItemImpl.h +++ b/src/ui/inc/FUiCtrl_HeaderItemImpl.h @@ -32,7 +32,6 @@ namespace Tizen { namespace Ui { namespace Controls { static const int HEADER_ITEM_ACTION_ID_MIN = 0; -static const int HEADER_ITEM_ACTION_ID_MAX = INT_MAX; static const int HEADER_ITEM_MAX_STATE_COUNT = 5; class _HeaderItemImpl