From 1699982f45d01cb18585eba80cce5326a63d3b67 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 8 Jun 2018 18:23:05 +0000 Subject: Ensure CJS_Return() with error always includes a message. Change the signature of the constructors to make it impossible to do this otherwise. Change-Id: I14e88d98a1128f2d599459ce9337cd6d079469fe Reviewed-on: https://pdfium-review.googlesource.com/34531 Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- fxjs/cjs_return.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'fxjs/cjs_return.cpp') diff --git a/fxjs/cjs_return.cpp b/fxjs/cjs_return.cpp index adfd1c5c9f..53ac5c0a28 100644 --- a/fxjs/cjs_return.cpp +++ b/fxjs/cjs_return.cpp @@ -6,13 +6,15 @@ #include "fxjs/cjs_return.h" -CJS_Return::CJS_Return(bool result) : is_error_(!result) {} - -CJS_Return::CJS_Return(const WideString& err) : is_error_(true), error_(err) {} +CJS_Return::CJS_Return() : is_error_(false) {} CJS_Return::CJS_Return(v8::Local ret) : is_error_(false), return_(ret) {} +CJS_Return::CJS_Return(const WideString& err) : is_error_(true), error_(err) {} + +CJS_Return::CJS_Return(JSMessage id) : CJS_Return(JSGetStringFromID(id)) {} + CJS_Return::CJS_Return(const CJS_Return&) = default; CJS_Return::~CJS_Return() = default; -- cgit v1.2.3