openharmony/accessibility
1
0
Fork 0
mirror of https://github.com/openharmony/accessibility.git synced 2026-08-24 22:11:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

增加减法下溢保护

Browse Source 
Signed-off-by: zhaoyixin1998 <zhaoyixin5@huawei.com>
This commit is contained in:
zhaoyixin1998
2026-07-07 16:33:33 +08:00
parent 5439d5dbdb
commit c667677014
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/kits/napi/src/napi_accessibility_utils.cpp
+13 -2
View File
@@ -462,6 +462,17 @@ bool CheckObserverEqual(napi_env env, napi_value observer, napi_env iterEnv, nap
return false;
}
static int32_t safe_subtract(int32_t minuend, int32_t subtrahend)
{
if (subtrahend > 0 && minuend < INT32_MIN + subtrahend) {
return 0;
}
if (subtrahend < 0 && minuend > INT32_MAX + subtrahend) {
return 0;
}
return minuend - subtrahend;
}
/**********************************************************
* Convert native object to js object
*********************************************************/
@@ -476,12 +487,12 @@ void ConvertRectToJS(napi_env env, napi_value result, const Accessibility::Rect&
NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, result, "top", nLeftTopY));
napi_value nWidth = nullptr;
int32_t width = rect.GetRightBottomXScreenPostion() - rect.GetLeftTopXScreenPostion();
int32_t width = safe_subtract(rect.GetRightBottomXScreenPostion(), rect.GetLeftTopXScreenPostion());
NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, width, &nWidth));
NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, result, "width", nWidth));
napi_value nHeight = nullptr;
int32_t height = rect.GetRightBottomYScreenPostion() - rect.GetLeftTopYScreenPostion();
int32_t height = safe_subtract(rect.GetRightBottomYScreenPostion(), rect.GetLeftTopYScreenPostion());
NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, height, &nHeight));
NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, result, "height", nHeight));
}