AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

check for null context on execution entry

Browse Source 
blink is incorrectly calling api functions without a context.  we need this to find those places

R=svenpanne@chromium.org

BUG=v8:3929
LOG=y

Review URL: https://codereview.chromium.org/968943002

Cr-Commit-Position: refs/heads/master@{#26943}
This commit is contained in:
Dan Carney 2015-03-02 15:17:11 +01:00
parent e1c2c9016e
commit 5f49fef325
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/api.cc
View File

@ -103,8 +103,7 @@ namespace v8 {
return bailout_value; \
} \
HandleScopeClass handle_scope(isolate); \
CallDepthScope call_depth_scope(isolate, false); \
v8::Context::Scope context_scope(context); \
CallDepthScope call_depth_scope(isolate, context, false); \
LOG_API(isolate, function_name); \
ENTER_V8(isolate); \
bool has_pending_exception = false
@ -160,12 +159,19 @@ class InternalEscapableScope : public v8::EscapableHandleScope {
class CallDepthScope {
public:
explicit CallDepthScope(i::Isolate* isolate, bool do_callback)
: isolate_(isolate), escaped_(false), do_callback_(do_callback) {
explicit CallDepthScope(i::Isolate* isolate, Local<Context> context,
bool do_callback)
: isolate_(isolate),
context_(context),
escaped_(false),
do_callback_(do_callback) {
// TODO(dcarney): remove this when blink stops crashing.
DCHECK(!isolate_->external_caught_exception());
isolate_->handle_scope_implementer()->IncrementCallDepth();
if (!context_.IsEmpty()) context_->Enter();
}
~CallDepthScope() {
if (!context_.IsEmpty()) context_->Exit();
if (!escaped_) isolate_->handle_scope_implementer()->DecrementCallDepth();
if (do_callback_) isolate_->FireCallCompletedCallback();
}
@ -181,6 +187,7 @@ class CallDepthScope {
private:
i::Isolate* const isolate_;
Local<Context> context_;
bool escaped_;
bool do_callback_;
};