openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-10-07 08:03:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modify some optional parameters to pass null application crash of container

Browse Source 
Signed-off-by: bi-hu <bihu@huawei.com>
https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/I7AVE3
This commit is contained in:
bi-hu 2023-06-05 11:16:40 +08:00
parent 4b04dda813
commit 26b807f46a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecmascript/base/array_helper.cpp
View File

@ -79,7 +79,7 @@ double ArrayHelper::SortCompare(JSThread *thread, const JSHandle<JSTaggedValue>
// b. ReturnIfAbrupt(v).
// c. If v is NaN, return +0.
// d. Return v.
if (!callbackfnHandle->IsUndefined()) {
if (!callbackfnHandle->IsUndefined() && !callbackfnHandle->IsNull()) {
JSHandle<JSTaggedValue> undefined = thread->GlobalConstants()->GetHandledUndefined();
EcmaRuntimeCallInfo *info =
EcmaInterpreter::NewRuntimeCallInfo(thread, callbackfnHandle, undefined, undefined, 2); // 2: «x, y»

2
ecmascript/containers/containers_arraylist.cpp
View File

@ -565,7 +565,7 @@ JSTaggedValue ContainersArrayList::Sort(EcmaRuntimeCallInfo *argv)
}
}
JSHandle<JSTaggedValue> callbackFnHandle = GetCallArg(argv, 0);
if (!callbackFnHandle->IsUndefined() && !callbackFnHandle->IsCallable()) {
if (!callbackFnHandle->IsUndefined() && !callbackFnHandle->IsCallable() && !callbackFnHandle->IsNull()) {
JSHandle<EcmaString> result = JSTaggedValue::ToString(thread, callbackFnHandle);
CString errorMsg =
"The type of \"comparator\" must be callable. Received value is: " + ConvertToString(*result);