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_annot.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_annot.cpp')
| -rw-r--r-- | fxjs/cjs_annot.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fxjs/cjs_annot.cpp b/fxjs/cjs_annot.cpp index b226621dd6..e47d189576 100644 --- a/fxjs/cjs_annot.cpp +++ b/fxjs/cjs_annot.cpp @@ -47,7 +47,7 @@ CJS_Annot::~CJS_Annot() = default; CJS_Return CJS_Annot::get_hidden(CJS_Runtime* pRuntime) { if (!m_pAnnot) - return CJS_Return(JSGetStringFromID(JSMessage::kBadObjectError)); + return CJS_Return(JSMessage::kBadObjectError); CPDF_Annot* pPDFAnnot = ToBAAnnot(m_pAnnot.Get())->GetPDFAnnot(); return CJS_Return(pRuntime->NewBoolean( @@ -59,7 +59,7 @@ CJS_Return CJS_Annot::set_hidden(CJS_Runtime* pRuntime, // May invalidate m_pAnnot. bool bHidden = pRuntime->ToBoolean(vp); if (!m_pAnnot) - return CJS_Return(JSGetStringFromID(JSMessage::kBadObjectError)); + return CJS_Return(JSMessage::kBadObjectError); uint32_t flags = ToBAAnnot(m_pAnnot.Get())->GetFlags(); if (bHidden) { @@ -75,12 +75,12 @@ CJS_Return CJS_Annot::set_hidden(CJS_Runtime* pRuntime, } ToBAAnnot(m_pAnnot.Get())->SetFlags(flags); - return CJS_Return(true); + return CJS_Return(); } CJS_Return CJS_Annot::get_name(CJS_Runtime* pRuntime) { if (!m_pAnnot) - return CJS_Return(JSGetStringFromID(JSMessage::kBadObjectError)); + return CJS_Return(JSMessage::kBadObjectError); return CJS_Return( pRuntime->NewString(ToBAAnnot(m_pAnnot.Get())->GetAnnotName().c_str())); } @@ -89,15 +89,15 @@ CJS_Return CJS_Annot::set_name(CJS_Runtime* pRuntime, v8::Local<v8::Value> vp) { // May invalidate m_pAnnot. WideString annotName = pRuntime->ToWideString(vp); if (!m_pAnnot) - return CJS_Return(JSGetStringFromID(JSMessage::kBadObjectError)); + return CJS_Return(JSMessage::kBadObjectError); ToBAAnnot(m_pAnnot.Get())->SetAnnotName(annotName); - return CJS_Return(true); + return CJS_Return(); } CJS_Return CJS_Annot::get_type(CJS_Runtime* pRuntime) { if (!m_pAnnot) - return CJS_Return(JSGetStringFromID(JSMessage::kBadObjectError)); + return CJS_Return(JSMessage::kBadObjectError); return CJS_Return(pRuntime->NewString( WideString::FromLocal(CPDF_Annot::AnnotSubtypeToString( ToBAAnnot(m_pAnnot.Get())->GetAnnotSubtype()) @@ -106,5 +106,5 @@ CJS_Return CJS_Annot::get_type(CJS_Runtime* pRuntime) { } CJS_Return CJS_Annot::set_type(CJS_Runtime* pRuntime, v8::Local<v8::Value> vp) { - return CJS_Return(JSGetStringFromID(JSMessage::kReadOnlyError)); + return CJS_Return(JSMessage::kReadOnlyError); } |