From 20736f7f5884cf1e2827543c92b6e47f8282aeaf Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Fri, 17 Aug 2018 16:44:50 +0000
Subject: Introduce safer CJS_Return::Success() and Failure().

Avoid the possibility of ever re-introducing the issue noticed
last week.

Remove some redundant JSGetStringFromID() calls.

Change-Id: I56687c2191bd72e378f747083f34080e50cbe490
Reviewed-on: https://pdfium-review.googlesource.com/40490
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
---
 fxjs/xfa/cjx_template.cpp | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'fxjs/xfa/cjx_template.cpp')

diff --git a/fxjs/xfa/cjx_template.cpp b/fxjs/xfa/cjx_template.cpp
index 8690083702..8f27b64bfb 100644
--- a/fxjs/xfa/cjx_template.cpp
+++ b/fxjs/xfa/cjx_template.cpp
@@ -31,48 +31,56 @@ CJS_Return CJX_Template::formNodes(
     CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   if (params.size() != 1)
-    return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
-  return CJS_Return(runtime->NewBoolean(true));
+    return CJS_Return::Failure(JSMessage::kParamError);
+
+  return CJS_Return::Success(runtime->NewBoolean(true));
 }
 
 CJS_Return CJX_Template::remerge(
     CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   if (!params.empty())
-    return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
+    return CJS_Return::Failure(JSMessage::kParamError);
 
   GetDocument()->DoDataRemerge(true);
-  return CJS_Return();
+  return CJS_Return::Success();
 }
 
 CJS_Return CJX_Template::execInitialize(
     CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   if (!params.empty())
-    return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
-  return CJS_Return(runtime->NewBoolean(GetXFANode()->IsWidgetReady()));
+    return CJS_Return::Failure(JSMessage::kParamError);
+
+  return CJS_Return::Success(
+      runtime->NewBoolean(GetXFANode()->IsWidgetReady()));
 }
 
 CJS_Return CJX_Template::recalculate(
     CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   if (params.size() != 1)
-    return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
-  return CJS_Return(runtime->NewBoolean(true));
+    return CJS_Return::Failure(JSMessage::kParamError);
+
+  return CJS_Return::Success(runtime->NewBoolean(true));
 }
 
 CJS_Return CJX_Template::execCalculate(
     CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   if (!params.empty())
-    return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
-  return CJS_Return(runtime->NewBoolean(GetXFANode()->IsWidgetReady()));
+    return CJS_Return::Failure(JSMessage::kParamError);
+
+  return CJS_Return::Success(
+      runtime->NewBoolean(GetXFANode()->IsWidgetReady()));
 }
 
 CJS_Return CJX_Template::execValidate(
     CFX_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
   if (!params.empty())
-    return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
-  return CJS_Return(runtime->NewBoolean(GetXFANode()->IsWidgetReady()));
+    return CJS_Return::Failure(JSMessage::kParamError);
+
+  return CJS_Return::Success(
+      runtime->NewBoolean(GetXFANode()->IsWidgetReady()));
 }
-- 
cgit v1.2.3