From c85139a4c745e414f51404c0d9b1b30fdbe8b4bc Mon Sep 17 00:00:00 2001
From: wengchangcheng <wengchangcheng@huawei.com>
Date: Mon, 6 Jun 2022 11:35:21 +0800
Subject: [PATCH] Descriptor: deal with invalid exception details: add empty
 check issue: https://gitee.com/openharmony/ark_js_runtime/issues/I5AT96

Signed-off-by: wengchangcheng <wengchangcheng@huawei.com>
Change-Id: I114a557d7b431f65b1a6145c2f0a0e674789e771
---
 ecmascript/tooling/agent/debugger_impl.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ecmascript/tooling/agent/debugger_impl.cpp b/ecmascript/tooling/agent/debugger_impl.cpp
index cbefad38cd..266f31ef68 100644
--- a/ecmascript/tooling/agent/debugger_impl.cpp
+++ b/ecmascript/tooling/agent/debugger_impl.cpp
@@ -527,7 +527,11 @@ DispatchResponse DebuggerImpl::EvaluateOnCallFrame(std::unique_ptr<EvaluateOnCal
     CString dest;
     if (!DecodeAndCheckBase64(expression, dest)) {
         LOG(ERROR, DEBUGGER) << "EvaluateValue: base64 decode failed";
-        return DispatchResponse::Create(CmptEvaluateValue(callFrameId, expression, result));
+        auto ret = CmptEvaluateValue(callFrameId, expression, result);
+        if (ret.has_value()) {
+            LOG(ERROR, DEBUGGER) << "Evaluate fail, expression: " << expression;
+        }
+        return DispatchResponse::Create(ret);
     }
 
     auto funcRef = DebuggerApi::GenerateFuncFromBuffer(vm_, dest.data(), dest.size(),
@@ -1066,6 +1070,9 @@ std::optional<CString> DebuggerImpl::CmptEvaluateValue(CallFrameId callFrameId,
         }
     } else {
         Local<JSValueRef> value = ConvertToLocal(varValue);
+        if (value.IsEmpty()) {
+            return "Unsupported expression.";
+        }
         bool ret = DebuggerExecutor::SetValue(vm_, frameHandler, name, value);
         if (ret) {
             *result = RemoteObject::FromTagged(vm_, value);
-- 
Gitee