diff options
author | Erin Spiceland <yes@erin.codes> | 2017-10-02 15:49:52 -0700 |
---|---|---|
committer | Myles Borins <mylesborins@google.com> | 2017-10-07 14:02:31 -0700 |
commit | be2a5b323e331aaef2991c7d7004f2ec833123f0 (patch) | |
tree | 3e3e1ccfa178a3f194918c71fefd371edbbc316f /deps/v8/src/inspector | |
parent | baa156f39dce577704aeba308a49f12be39bb992 (diff) | |
download | android-node-v8-be2a5b323e331aaef2991c7d7004f2ec833123f0.tar.gz android-node-v8-be2a5b323e331aaef2991c7d7004f2ec833123f0.tar.bz2 android-node-v8-be2a5b323e331aaef2991c7d7004f2ec833123f0.zip |
deps: cherry-pick f4a2b7f3 from V8 upstream.
Original commit message:
should ignore asyncTask* with null
In V8Debugger code we don't expect task_id == null, e.g.
asyncTaskStartedForStepping will trigger debug break on null as task_id.
Let's filter task_id == null out.
This issue is originally filed in Node.js:
https://github.com/nodejs/node/issues/15464
R=dgozman@chromium.org
Bug: none
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Icc9f96105b3c91ee1b102d545a7817f7ee93394c
Reviewed-on: https://chromium-review.googlesource.com/695808
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48265}
Fixes https://github.com/nodejs/node/issues/15464
PR-URL: https://github.com/nodejs/node/pull/16053
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Michaƫl Zasso <mic.besace@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/v8/src/inspector')
-rw-r--r-- | deps/v8/src/inspector/v8-inspector-impl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/deps/v8/src/inspector/v8-inspector-impl.cc b/deps/v8/src/inspector/v8-inspector-impl.cc index 0a7b19a36a..4cdbba9c91 100644 --- a/deps/v8/src/inspector/v8-inspector-impl.cc +++ b/deps/v8/src/inspector/v8-inspector-impl.cc @@ -286,18 +286,22 @@ std::unique_ptr<V8StackTrace> V8InspectorImpl::captureStackTrace( void V8InspectorImpl::asyncTaskScheduled(const StringView& taskName, void* task, bool recurring) { + if (!task) return; m_debugger->asyncTaskScheduled(taskName, task, recurring); } void V8InspectorImpl::asyncTaskCanceled(void* task) { + if (!task) return; m_debugger->asyncTaskCanceled(task); } void V8InspectorImpl::asyncTaskStarted(void* task) { + if (!task) return; m_debugger->asyncTaskStarted(task); } void V8InspectorImpl::asyncTaskFinished(void* task) { + if (!task) return; m_debugger->asyncTaskFinished(task); } |