Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp

Issue 1739613002: DevTools: validate protocol input parameters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaselined a test. Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript (remoteId.get()); 145 InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript (remoteId.get());
146 if (!injectedScript) { 146 if (!injectedScript) {
147 *errorString = "Inspected frame has gone"; 147 *errorString = "Inspected frame has gone";
148 return; 148 return;
149 } 149 }
150 150
151 IgnoreExceptionsScope ignoreExceptionsScope(m_debugger); 151 IgnoreExceptionsScope ignoreExceptionsScope(m_debugger);
152 152
153 injectedScript->getProperties(errorString, objectId, ownProperties.fromMaybe (false), accessorPropertiesOnly.fromMaybe(false), generatePreview.fromMaybe(fals e), result, exceptionDetails); 153 injectedScript->getProperties(errorString, objectId, ownProperties.fromMaybe (false), accessorPropertiesOnly.fromMaybe(false), generatePreview.fromMaybe(fals e), result, exceptionDetails);
154 154
155 if (!exceptionDetails->isJust() && !accessorPropertiesOnly.fromMaybe(false)) 155 if (errorString->isEmpty() && !exceptionDetails->isJust() && !accessorProper tiesOnly.fromMaybe(false))
156 injectedScript->getInternalProperties(errorString, objectId, internalPro perties, exceptionDetails); 156 injectedScript->getInternalProperties(errorString, objectId, internalPro perties, exceptionDetails);
157 } 157 }
158 158
159 void V8RuntimeAgentImpl::releaseObject(ErrorString* errorString, const String& o bjectId) 159 void V8RuntimeAgentImpl::releaseObject(ErrorString* errorString, const String& o bjectId)
160 { 160 {
161 OwnPtr<RemoteObjectId> remoteId = RemoteObjectId::parse(objectId); 161 OwnPtr<RemoteObjectId> remoteId = RemoteObjectId::parse(objectId);
162 if (!remoteId) { 162 if (!remoteId) {
163 *errorString = "Invalid object id"; 163 *errorString = "Invalid object id";
164 return; 164 return;
165 } 165 }
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 OwnPtr<ExceptionDetails> exceptionDetails = ExceptionDetails::create().setTe xt(toWTFStringWithTypeCheck(message->Get())).build(); 435 OwnPtr<ExceptionDetails> exceptionDetails = ExceptionDetails::create().setTe xt(toWTFStringWithTypeCheck(message->Get())).build();
436 exceptionDetails->setLine(message->GetLineNumber()); 436 exceptionDetails->setLine(message->GetLineNumber());
437 exceptionDetails->setColumn(message->GetStartColumn()); 437 exceptionDetails->setColumn(message->GetStartColumn());
438 v8::Local<v8::StackTrace> messageStackTrace = message->GetStackTrace(); 438 v8::Local<v8::StackTrace> messageStackTrace = message->GetStackTrace();
439 if (!messageStackTrace.IsEmpty() && messageStackTrace->GetFrameCount() > 0) 439 if (!messageStackTrace.IsEmpty() && messageStackTrace->GetFrameCount() > 0)
440 exceptionDetails->setStack(m_debugger->createStackTrace(messageStackTrac e, messageStackTrace->GetFrameCount())->buildInspectorObject()); 440 exceptionDetails->setStack(m_debugger->createStackTrace(messageStackTrac e, messageStackTrace->GetFrameCount())->buildInspectorObject());
441 return exceptionDetails.release(); 441 return exceptionDetails.release();
442 } 442 }
443 443
444 } // namespace blink 444 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698