From aecd9d0c5cfc569269bfe6cc228efaab76a7bb1b Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 31 Aug 2015 15:04:12 -0700 Subject: Merge to XFA: Fix two issues shown by bug 489995 (cherry picked from commit 6e369c2ebb4769a42736b32154c0de12b73df45d) Original Review URL: https://codereview.chromium.org/1327473002 . BUG=489995 R=thestig@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1325743002 . --- fpdfsdk/src/javascript/Document.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index 7f078e5a5e..1e8d4fde8f 100644 --- a/fpdfsdk/src/javascript/Document.cpp +++ b/fpdfsdk/src/javascript/Document.cpp @@ -1408,8 +1408,12 @@ FX_BOOL Document::addIcon(IFXJS_Context* cc, sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR); return FALSE; } - CFX_WideString swIconName = params[0].ToCFXWideString(); + + if (params[1].GetType() != VT_object) { + sError = JSGetStringFromID(pContext, IDS_STRING_JSTYPEERROR); + return FALSE; + } JSFXObject pJSIcon = params[1].ToV8Object(); CJS_Runtime* pRuntime = pContext->GetJSRuntime(); -- cgit v1.2.3