diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-08 18:23:05 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-08 18:23:05 +0000 |
| commit | 1699982f45d01cb18585eba80cce5326a63d3b67 (patch) | |
| tree | 537d81d989632bab75fda37f5b587e1309e60d5d /fxjs/cjs_color.cpp | |
| parent | f29479d47156d180c0b71f6c98aa4de37c2a7ee2 (diff) | |
| download | pdfium-1699982f45d01cb18585eba80cce5326a63d3b67.tar.xz | |
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 <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs/cjs_color.cpp')
| -rw-r--r-- | fxjs/cjs_color.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/fxjs/cjs_color.cpp b/fxjs/cjs_color.cpp index e46ddce69d..282c58f927 100644 --- a/fxjs/cjs_color.cpp +++ b/fxjs/cjs_color.cpp @@ -253,19 +253,17 @@ CJS_Return CJS_Color::SetPropertyHelper(CJS_Runtime* pRuntime, v8::Local<v8::Value> vp, CFX_Color* var) { if (vp.IsEmpty() || !vp->IsArray()) - return CJS_Return(false); + return CJS_Return(JSMessage::kParamError); *var = ConvertArrayToPWLColor(pRuntime, pRuntime->ToArray(vp)); - return CJS_Return(true); + return CJS_Return(); } CJS_Return CJS_Color::convert(CJS_Runtime* pRuntime, const std::vector<v8::Local<v8::Value>>& params) { int iSize = params.size(); - if (iSize < 2) - return CJS_Return(false); - if (params[0].IsEmpty() || !params[0]->IsArray()) - return CJS_Return(false); + if (iSize < 2 || params[0].IsEmpty() || !params[0]->IsArray()) + return CJS_Return(JSMessage::kParamError); WideString sDestSpace = pRuntime->ToWideString(params[1]); int nColorType = CFX_Color::kTransparent; @@ -290,11 +288,9 @@ CJS_Return CJS_Color::convert(CJS_Runtime* pRuntime, CJS_Return CJS_Color::equal(CJS_Runtime* pRuntime, const std::vector<v8::Local<v8::Value>>& params) { - if (params.size() < 2) - return CJS_Return(false); - if (params[0].IsEmpty() || !params[0]->IsArray() || params[1].IsEmpty() || - !params[1]->IsArray()) { - return CJS_Return(false); + if (params.size() < 2 || params[0].IsEmpty() || !params[0]->IsArray() || + params[1].IsEmpty() || !params[1]->IsArray()) { + return CJS_Return(JSMessage::kParamError); } CFX_Color color1 = |