From 005b6af7924e44f28eab2c5228fd9eb2538a6c3e Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 15 Sep 2015 17:08:15 -0700 Subject: Merge to M46: Fix JS_GetArrayElement to not return an empty handle on success BUG=chromium:528376 TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/1337433002 . (cherry picked from commit 0d0935d3d6603dd7d851b1d5828635230f4c43ca) Review URL: https://codereview.chromium.org/1342333002 . --- fpdfsdk/src/jsapi/fxjs_v8.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index b71cee6bcc..ba65d30755 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -766,7 +766,7 @@ v8::Local JS_GetArrayElement(IJS_Runtime* pJSRuntime, if (pArray.IsEmpty()) return v8::Local(); v8::Local val; - if (pArray->Get(pJSRuntime->GetCurrentContext(), index).ToLocal(&val)) + if (!pArray->Get(pJSRuntime->GetCurrentContext(), index).ToLocal(&val)) return v8::Local(); return val; } -- cgit v1.2.3