Skip to content

GitLab

T
tangled
Commit 1578228c authored by Mike Pennisi's avatar Mike Pennisi Committed by Commit Bot
Browse files
Options

[ChromeDriver] Avoid cache interference 

Use an object with a null prototype for the internal mapping of names to
cached values. This reduces the likelihood of unintended interaction
with the environment (e.g. when new enumerable prototypes are defined on
the Object prototype).

Update the testing code so that this change is verifiable.

Bug: 1014780
Change-Id: Ifbdc8d09c1049d0ec07f7a0099d774579423cdb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894707Reviewed-by: default avatarJohn Chen <johnchen@chromium.org>
Commit-Queue: Christian Biesinger <cbiesinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713496}
parent 0a0395f5
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 3 deletions
chrome/test/chromedriver/js/call_function.js
View file @ 1578228c
...@@ -82,7 +82,7 @@ function newError(message, code) { ...@@ -82,7 +82,7 @@ function newError(message, code) {
* @constructor * @constructor
*/ */
function CacheWithUUID() { function CacheWithUUID() {
this.cache_ = {}; this.cache_ = Object.create(null);
} }
CacheWithUUID.prototype = { CacheWithUUID.prototype = {
...@@ -146,7 +146,7 @@ CacheWithUUID.prototype = { ...@@ -146,7 +146,7 @@ CacheWithUUID.prototype = {
* @constructor * @constructor
*/ */
function Cache() { function Cache() {
this.cache_ = {}; this.cache_ = Object.create(null);
this.nextId_ = 1; this.nextId_ = 1;
this.idPrefix_ = Math.random().toString(); this.idPrefix_ = Math.random().toString();
} }
......
chrome/test/chromedriver/js/call_function_test.html
View file @ 1578228c
...@@ -11,8 +11,9 @@ function unwrap(value, opt_cache) { ...@@ -11,8 +11,9 @@ function unwrap(value, opt_cache) {
return jsonDeserialize(value, [], opt_cache); return jsonDeserialize(value, [], opt_cache);
} }
var initialCache = getPageCache().cache_;
function clearCache() { function clearCache() {
getPageCache().cache_ = {}; getPageCache().cache_ = Object.create(initialCache);
} }
function isValidUUID(uuid) { function isValidUUID(uuid) {
...@@ -349,6 +350,26 @@ function testCallWithArrayToJSON(runner) { ...@@ -349,6 +350,26 @@ function testCallWithArrayToJSON(runner) {
runner.waitForAsync(); runner.waitForAsync();
} }
function testCallWithModifiedObjectProto(runner) {
var callCount = 0;
Object.defineProperty(Object.prototype, 'f', {
enumerable: true,
configurable: true,
get: function() {
callCount += 1;
}
});
callFunction(function() {}, []).then(() => {
try {
assertEquals(callCount, 0);
runner.continueTesting();
} finally {
delete Object.prototype.f;
}
});
runner.waitForAsync();
}
</script> </script>
<body> <body>
<div><span></span></div> <div><span></span></div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment