commit bee6d0b1540e57dd815d1fc9582e09d6915e9929
author Tom Sepez <tsepez@chromium.org> Wed Nov 29 17:33:34 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Nov 29 17:33:34 2023 +0000
tree 54bcd5afded63639f593057d946289dfc9ca1f3d
parent 40d92c45b3aaf51cf033360e06ab497a2d6afdc8

Remove out parameter from DynPropGetterAdapter().

Directly create the CFXJSE_Value to return, rather than assigning to
one that a caller passed.

Change-Id: I37e47f52d590c135c0cfa41a6aff9ac08e9f3b28
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/114011
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

fxjs/xfa/cfxjse_class.cpp

diff --git a/fxjs/xfa/cfxjse_class.cpp b/fxjs/xfa/cfxjse_class.cpp
index d0668f4..0c55837 100644
--- a/fxjs/xfa/cfxjse_class.cpp
+++ b/fxjs/xfa/cfxjse_class.cpp
@@ -122,13 +122,11 @@
     info.GetReturnValue().Set(result.Return());
 }
 
-void DynPropGetterAdapter(v8::Isolate* pIsolate,
-                          const FXJSE_CLASS_DESCRIPTOR* pClassDescriptor,
-                          v8::Local<v8::Object> pObject,
-                          ByteStringView szPropName,
-                          CFXJSE_Value* pValue) {
-  DCHECK(pClassDescriptor);
-
+std::unique_ptr<CFXJSE_Value> DynPropGetterAdapter(
+    v8::Isolate* pIsolate,
+    const FXJSE_CLASS_DESCRIPTOR* pClassDescriptor,
+    v8::Local<v8::Object> pObject,
+    ByteStringView szPropName) {
   FXJSE_ClassPropType nPropType =
       pClassDescriptor->dynPropTypeGetter
           ? pClassDescriptor->dynPropTypeGetter(pIsolate, pObject, szPropName,
@@ -136,11 +134,12 @@
           : FXJSE_ClassPropType::kProperty;
   if (nPropType == FXJSE_ClassPropType::kProperty) {
     if (pClassDescriptor->dynPropGetter) {
-      pValue->ForceSetValue(pIsolate, pClassDescriptor->dynPropGetter(
-                                          pIsolate, pObject, szPropName));
+      return std::make_unique<CFXJSE_Value>(
+          pIsolate,
+          pClassDescriptor->dynPropGetter(pIsolate, pObject, szPropName));
     }
   } else if (nPropType == FXJSE_ClassPropType::kMethod) {
-    if (pClassDescriptor->dynMethodCall && pValue) {
+    if (pClassDescriptor->dynMethodCall) {
       v8::HandleScope hscope(pIsolate);
       v8::Local<v8::ObjectTemplate> hCallBackInfoTemplate =
           v8::ObjectTemplate::New(pIsolate);
@@ -152,7 +151,7 @@
           0, const_cast<FXJSE_CLASS_DESCRIPTOR*>(pClassDescriptor));
       hCallBackInfo->SetInternalField(
           1, fxv8::NewStringHelper(pIsolate, szPropName));
-      pValue->ForceSetValue(
+      return std::make_unique<CFXJSE_Value>(
           pIsolate,
           v8::Function::New(pIsolate->GetCurrentContext(),
                             DynPropGetterAdapter_MethodCallback, hCallBackInfo,
@@ -160,6 +159,7 @@
               .ToLocalChecked());
     }
   }
+  return std::make_unique<CFXJSE_Value>();
 }
 
 void DynPropSetterAdapter(v8::Isolate* pIsolate,
@@ -222,9 +222,8 @@
 
   v8::String::Utf8Value szPropName(info.GetIsolate(), property);
   ByteStringView szFxPropName(*szPropName, szPropName.length());
-  auto pNewValue = std::make_unique<CFXJSE_Value>();
-  DynPropGetterAdapter(info.GetIsolate(), pClass, info.Holder(), szFxPropName,
-                       pNewValue.get());
+  std::unique_ptr<CFXJSE_Value> pNewValue = DynPropGetterAdapter(
+      info.GetIsolate(), pClass, info.Holder(), szFxPropName);
   info.GetReturnValue().Set(pNewValue->DirectGetValue());
 }