third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp - Issue 1867903002: [DevTools] Fix crash when runtime.evaluate is called with contextId = 0

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp

Issue 1867903002: [DevTools] Fix crash when runtime.evaluate is called with contextId = 0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/inspector-protocol/runtime/runtime-evaluate-with-context-id-equal-zero-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp

diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp

index 70eeef743bccd7777126dc9be45455c501a263fe..78f081c67cddd600f1470f0bd35622ab6affa79e 100644

--- a/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp

+++ b/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp

@@ -89,6 +89,11 @@ void V8InspectorSessionImpl::discardInjectedScripts()

InjectedScript* V8InspectorSessionImpl::findInjectedScript(ErrorString* errorString, int contextId)

{

+ if (!contextId) {

+ *errorString = "Invalid context id: 0";

dgozman 2016/04/07 17:59:09 Cannot find context with specified id

kozy 2016/04/07 18:07:33 Done.

+ return nullptr;

+ }

const V8DebuggerImpl::ContextByIdMap* contexts = m_debugger->contextGroup(m_contextGroupId);

if (!contexts || !contexts->contains(contextId)) {

*errorString = "Inspected frame has gone";

dgozman 2016/04/07 17:59:09 Cannot find context with specified id

kozy 2016/04/07 18:07:33 Done.