Skip to content

Fix race condition when accessing nested JsonTypeInfo metadata#81821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eiriktsarpalis merged 3 commits into from
Feb 8, 2023
Merged

Fix race condition when accessing nested JsonTypeInfo metadata #81821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfa3a51
Fix race condition when accessing nested JsonTypeInfo metadata
eiriktsarpalis Feb 8, 2023
2d649bd
Improve wording in comments.
eiriktsarpalis Feb 8, 2023
26b1150
Remove DEBUG conditional
eiriktsarpalis Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...s/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPolymorphismOptions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ public DerivedTypeList(JsonPolymorphismOptions parent)
_parent = parent;
}

protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsConfigured == true;
protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsReadOnly == true;
Comment thread
eiriktsarpalis marked this conversation as resolved.
protected override void VerifyMutable() => _parent.DeclaringTypeInfo?.VerifyMutable();
}

Expand Down
10 changes: 8 additions & 2 deletions ...ibraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -791,8 +791,14 @@ internal JsonTypeInfo JsonTypeInfo
get
{
Debug.Assert(IsConfigured);
Debug.Assert(_jsonTypeInfo?.IsConfigured == true);
return _jsonTypeInfo;
Debug.Assert(_jsonTypeInfo?.IsConfigurationStarted == true);
// Even though this instance has already been configured,
// it is possible for contending threads to call the property
// while the wider JsonTypeInfo graph is still being configured.
// Call EnsureConfigured() to force synchronization if necessary.
JsonTypeInfo jsonTypeInfo = _jsonTypeInfo;
jsonTypeInfo.EnsureConfigured();
return jsonTypeInfo;
}
set
{
Expand Down
19 changes: 17 additions & 2 deletions src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -322,7 +322,14 @@ internal JsonTypeInfo? ElementTypeInfo
get
{
Debug.Assert(IsConfigured);
return _elementTypeInfo;
Debug.Assert(_elementTypeInfo is null or { IsConfigurationStarted: true });
// Even though this instance has already been configured,
// it is possible for contending threads to call the property
// while the wider JsonTypeInfo graph is still being configured.
// Call EnsureConfigured() to force synchronization if necessary.
JsonTypeInfo? elementTypeInfo = _elementTypeInfo;
elementTypeInfo?.EnsureConfigured();
return elementTypeInfo;
}
set
{
Expand All@@ -340,7 +347,14 @@ internal JsonTypeInfo? KeyTypeInfo
get
{
Debug.Assert(IsConfigured);
return _keyTypeInfo;
Debug.Assert(_keyTypeInfo is null or { IsConfigurationStarted: true });
// Even though this instance has already been configured,
// it is possible for contending threads to call the property
// while the wider JsonTypeInfo graph is still being configured.
// Call EnsureConfigured() to force synchronization if necessary.
JsonTypeInfo? keyTypeInfo = _keyTypeInfo;
keyTypeInfo?.EnsureConfigured();
return keyTypeInfo;
}
set
{
Expand DownExpand Up@@ -491,6 +505,7 @@ internal void VerifyMutable()
}

internal bool IsConfigured => _configurationState == ConfigurationState.Configured;
internal bool IsConfigurationStarted => _configurationState is not ConfigurationState.NotConfigured;
private volatile ConfigurationState _configurationState;
private enum ConfigurationState : byte { NotConfigured = 0, Configuring = 1, Configured = 2 };

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix race condition when accessing nested JsonTypeInfo metadata by eiriktsarpalis · Pull Request #81821 · dotnet/runtime · GitHub
Skip to content
Fix race condition when accessing nested JsonTypeInfo metadata#81821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

eiriktsarpalis
merged 3 commits into

from

Feb 8, 2023
 Merged


Fix race condition when accessing nested JsonTypeInfo metadata
#81821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bfa3a51

Fix race condition when accessing nested JsonTypeInfo metadata


eiriktsarpalis Feb 8, 2023
2d649bd

Improve wording in comments.


eiriktsarpalis Feb 8, 2023
26b1150

Remove DEBUG conditional


eiriktsarpalis Feb 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
...s/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPolymorphismOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ public DerivedTypeList(JsonPolymorphismOptions parent)
 _parent = parent;
 }

 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsConfigured == true;
 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsReadOnly == true;
Comment thread
eiriktsarpalis marked this conversation as resolved.

 protected override void VerifyMutable() => _parent.DeclaringTypeInfo?.VerifyMutable();
 }

Expand Down

10 changes: 8 additions & 2 deletions
...ibraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -791,8 +791,14 @@ internal JsonTypeInfo JsonTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 Debug.Assert(_jsonTypeInfo?.IsConfigured == true);
 return _jsonTypeInfo;
 Debug.Assert(_jsonTypeInfo?.IsConfigurationStarted == true);
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo jsonTypeInfo = _jsonTypeInfo;
 jsonTypeInfo.EnsureConfigured();
 return jsonTypeInfo;
 }
 set
 {
Expand Down

19 changes: 17 additions & 2 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -322,7 +322,14 @@ internal JsonTypeInfo? ElementTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _elementTypeInfo;
 Debug.Assert(_elementTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? elementTypeInfo = _elementTypeInfo;
 elementTypeInfo?.EnsureConfigured();
 return elementTypeInfo;
 }
 set
 {
Expand All@@ -340,7 +347,14 @@ internal JsonTypeInfo? KeyTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _keyTypeInfo;
 Debug.Assert(_keyTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? keyTypeInfo = _keyTypeInfo;
 keyTypeInfo?.EnsureConfigured();
 return keyTypeInfo;
 }
 set
 {
Expand DownExpand Up@@ -491,6 +505,7 @@ internal void VerifyMutable()
 }

 internal bool IsConfigured => _configurationState == ConfigurationState.Configured;
 internal bool IsConfigurationStarted => _configurationState is not ConfigurationState.NotConfigured;
 private volatile ConfigurationState _configurationState;
 private enum ConfigurationState : byte { NotConfigured = 0, Configuring = 1, Configured = 2 };

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix race condition when accessing nested JsonTypeInfo metadata by eiriktsarpalis · Pull Request #81821 · dotnet/runtime · GitHub
Skip to content
Fix race condition when accessing nested JsonTypeInfo metadata#81821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

eiriktsarpalis
merged 3 commits into

from

Feb 8, 2023
 Merged


Fix race condition when accessing nested JsonTypeInfo metadata
#81821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bfa3a51

Fix race condition when accessing nested JsonTypeInfo metadata


eiriktsarpalis Feb 8, 2023
2d649bd

Improve wording in comments.


eiriktsarpalis Feb 8, 2023
26b1150

Remove DEBUG conditional


eiriktsarpalis Feb 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
...s/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPolymorphismOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ public DerivedTypeList(JsonPolymorphismOptions parent)
 _parent = parent;
 }

 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsConfigured == true;
 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsReadOnly == true;
Comment thread
eiriktsarpalis marked this conversation as resolved.

 protected override void VerifyMutable() => _parent.DeclaringTypeInfo?.VerifyMutable();
 }

Expand Down

10 changes: 8 additions & 2 deletions
...ibraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -791,8 +791,14 @@ internal JsonTypeInfo JsonTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 Debug.Assert(_jsonTypeInfo?.IsConfigured == true);
 return _jsonTypeInfo;
 Debug.Assert(_jsonTypeInfo?.IsConfigurationStarted == true);
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo jsonTypeInfo = _jsonTypeInfo;
 jsonTypeInfo.EnsureConfigured();
 return jsonTypeInfo;
 }
 set
 {
Expand Down

19 changes: 17 additions & 2 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -322,7 +322,14 @@ internal JsonTypeInfo? ElementTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _elementTypeInfo;
 Debug.Assert(_elementTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? elementTypeInfo = _elementTypeInfo;
 elementTypeInfo?.EnsureConfigured();
 return elementTypeInfo;
 }
 set
 {
Expand All@@ -340,7 +347,14 @@ internal JsonTypeInfo? KeyTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _keyTypeInfo;
 Debug.Assert(_keyTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? keyTypeInfo = _keyTypeInfo;
 keyTypeInfo?.EnsureConfigured();
 return keyTypeInfo;
 }
 set
 {
Expand DownExpand Up@@ -491,6 +505,7 @@ internal void VerifyMutable()
 }

 internal bool IsConfigured => _configurationState == ConfigurationState.Configured;
 internal bool IsConfigurationStarted => _configurationState is not ConfigurationState.NotConfigured;
 private volatile ConfigurationState _configurationState;
 private enum ConfigurationState : byte { NotConfigured = 0, Configuring = 1, Configured = 2 };

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix race condition when accessing nested JsonTypeInfo metadata by eiriktsarpalis · Pull Request #81821 · dotnet/runtime · GitHub
Skip to content
Fix race condition when accessing nested JsonTypeInfo metadata#81821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

eiriktsarpalis
merged 3 commits into

from

Feb 8, 2023
 Merged


Fix race condition when accessing nested JsonTypeInfo metadata
#81821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bfa3a51

Fix race condition when accessing nested JsonTypeInfo metadata


eiriktsarpalis Feb 8, 2023
2d649bd

Improve wording in comments.


eiriktsarpalis Feb 8, 2023
26b1150

Remove DEBUG conditional


eiriktsarpalis Feb 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
...s/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPolymorphismOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ public DerivedTypeList(JsonPolymorphismOptions parent)
 _parent = parent;
 }

 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsConfigured == true;
 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsReadOnly == true;
Comment thread
eiriktsarpalis marked this conversation as resolved.

 protected override void VerifyMutable() => _parent.DeclaringTypeInfo?.VerifyMutable();
 }

Expand Down

10 changes: 8 additions & 2 deletions
...ibraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -791,8 +791,14 @@ internal JsonTypeInfo JsonTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 Debug.Assert(_jsonTypeInfo?.IsConfigured == true);
 return _jsonTypeInfo;
 Debug.Assert(_jsonTypeInfo?.IsConfigurationStarted == true);
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo jsonTypeInfo = _jsonTypeInfo;
 jsonTypeInfo.EnsureConfigured();
 return jsonTypeInfo;
 }
 set
 {
Expand Down

19 changes: 17 additions & 2 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -322,7 +322,14 @@ internal JsonTypeInfo? ElementTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _elementTypeInfo;
 Debug.Assert(_elementTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? elementTypeInfo = _elementTypeInfo;
 elementTypeInfo?.EnsureConfigured();
 return elementTypeInfo;
 }
 set
 {
Expand All@@ -340,7 +347,14 @@ internal JsonTypeInfo? KeyTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _keyTypeInfo;
 Debug.Assert(_keyTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? keyTypeInfo = _keyTypeInfo;
 keyTypeInfo?.EnsureConfigured();
 return keyTypeInfo;
 }
 set
 {
Expand DownExpand Up@@ -491,6 +505,7 @@ internal void VerifyMutable()
 }

 internal bool IsConfigured => _configurationState == ConfigurationState.Configured;
 internal bool IsConfigurationStarted => _configurationState is not ConfigurationState.NotConfigured;
 private volatile ConfigurationState _configurationState;
 private enum ConfigurationState : byte { NotConfigured = 0, Configuring = 1, Configured = 2 };

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Fix race condition when accessing nested JsonTypeInfo metadata by eiriktsarpalis · Pull Request #81821 · dotnet/runtime · GitHub
Skip to content
Fix race condition when accessing nested JsonTypeInfo metadata#81821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

eiriktsarpalis
merged 3 commits into

from

Feb 8, 2023
 Merged


Fix race condition when accessing nested JsonTypeInfo metadata
#81821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bfa3a51

Fix race condition when accessing nested JsonTypeInfo metadata


eiriktsarpalis Feb 8, 2023
2d649bd

Improve wording in comments.


eiriktsarpalis Feb 8, 2023
26b1150

Remove DEBUG conditional


eiriktsarpalis Feb 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
...s/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPolymorphismOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ public DerivedTypeList(JsonPolymorphismOptions parent)
 _parent = parent;
 }

 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsConfigured == true;
 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsReadOnly == true;
Comment thread
eiriktsarpalis marked this conversation as resolved.

 protected override void VerifyMutable() => _parent.DeclaringTypeInfo?.VerifyMutable();
 }

Expand Down

10 changes: 8 additions & 2 deletions
...ibraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -791,8 +791,14 @@ internal JsonTypeInfo JsonTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 Debug.Assert(_jsonTypeInfo?.IsConfigured == true);
 return _jsonTypeInfo;
 Debug.Assert(_jsonTypeInfo?.IsConfigurationStarted == true);
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo jsonTypeInfo = _jsonTypeInfo;
 jsonTypeInfo.EnsureConfigured();
 return jsonTypeInfo;
 }
 set
 {
Expand Down

19 changes: 17 additions & 2 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -322,7 +322,14 @@ internal JsonTypeInfo? ElementTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _elementTypeInfo;
 Debug.Assert(_elementTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? elementTypeInfo = _elementTypeInfo;
 elementTypeInfo?.EnsureConfigured();
 return elementTypeInfo;
 }
 set
 {
Expand All@@ -340,7 +347,14 @@ internal JsonTypeInfo? KeyTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _keyTypeInfo;
 Debug.Assert(_keyTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? keyTypeInfo = _keyTypeInfo;
 keyTypeInfo?.EnsureConfigured();
 return keyTypeInfo;
 }
 set
 {
Expand DownExpand Up@@ -491,6 +505,7 @@ internal void VerifyMutable()
 }

 internal bool IsConfigured => _configurationState == ConfigurationState.Configured;
 internal bool IsConfigurationStarted => _configurationState is not ConfigurationState.NotConfigured;
 private volatile ConfigurationState _configurationState;
 private enum ConfigurationState : byte { NotConfigured = 0, Configuring = 1, Configured = 2 };

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix race condition when accessing nested JsonTypeInfo metadata by eiriktsarpalis · Pull Request #81821 · dotnet/runtime · GitHub
Skip to content
Fix race condition when accessing nested JsonTypeInfo metadata#81821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

eiriktsarpalis
merged 3 commits into

from

Feb 8, 2023
 Merged


Fix race condition when accessing nested JsonTypeInfo metadata
#81821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bfa3a51

Fix race condition when accessing nested JsonTypeInfo metadata


eiriktsarpalis Feb 8, 2023
2d649bd

Improve wording in comments.


eiriktsarpalis Feb 8, 2023
26b1150

Remove DEBUG conditional


eiriktsarpalis Feb 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
...s/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPolymorphismOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ public DerivedTypeList(JsonPolymorphismOptions parent)
 _parent = parent;
 }

 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsConfigured == true;
 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsReadOnly == true;
Comment thread
eiriktsarpalis marked this conversation as resolved.

 protected override void VerifyMutable() => _parent.DeclaringTypeInfo?.VerifyMutable();
 }

Expand Down

10 changes: 8 additions & 2 deletions
...ibraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -791,8 +791,14 @@ internal JsonTypeInfo JsonTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 Debug.Assert(_jsonTypeInfo?.IsConfigured == true);
 return _jsonTypeInfo;
 Debug.Assert(_jsonTypeInfo?.IsConfigurationStarted == true);
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo jsonTypeInfo = _jsonTypeInfo;
 jsonTypeInfo.EnsureConfigured();
 return jsonTypeInfo;
 }
 set
 {
Expand Down

19 changes: 17 additions & 2 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -322,7 +322,14 @@ internal JsonTypeInfo? ElementTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _elementTypeInfo;
 Debug.Assert(_elementTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? elementTypeInfo = _elementTypeInfo;
 elementTypeInfo?.EnsureConfigured();
 return elementTypeInfo;
 }
 set
 {
Expand All@@ -340,7 +347,14 @@ internal JsonTypeInfo? KeyTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _keyTypeInfo;
 Debug.Assert(_keyTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? keyTypeInfo = _keyTypeInfo;
 keyTypeInfo?.EnsureConfigured();
 return keyTypeInfo;
 }
 set
 {
Expand DownExpand Up@@ -491,6 +505,7 @@ internal void VerifyMutable()
 }

 internal bool IsConfigured => _configurationState == ConfigurationState.Configured;
 internal bool IsConfigurationStarted => _configurationState is not ConfigurationState.NotConfigured;
 private volatile ConfigurationState _configurationState;
 private enum ConfigurationState : byte { NotConfigured = 0, Configuring = 1, Configured = 2 };

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Fix race condition when accessing nested JsonTypeInfo metadata by eiriktsarpalis · Pull Request #81821 · dotnet/runtime · GitHub
Skip to content
Fix race condition when accessing nested JsonTypeInfo metadata#81821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

eiriktsarpalis
merged 3 commits into

from

Feb 8, 2023
 Merged


Fix race condition when accessing nested JsonTypeInfo metadata
#81821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bfa3a51

Fix race condition when accessing nested JsonTypeInfo metadata


eiriktsarpalis Feb 8, 2023
2d649bd

Improve wording in comments.


eiriktsarpalis Feb 8, 2023
26b1150

Remove DEBUG conditional


eiriktsarpalis Feb 8, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
...s/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPolymorphismOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ public DerivedTypeList(JsonPolymorphismOptions parent)
 _parent = parent;
 }

 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsConfigured == true;
 protected override bool IsImmutable => _parent.DeclaringTypeInfo?.IsReadOnly == true;
Comment thread
eiriktsarpalis marked this conversation as resolved.

 protected override void VerifyMutable() => _parent.DeclaringTypeInfo?.VerifyMutable();
 }

Expand Down

10 changes: 8 additions & 2 deletions
...ibraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -791,8 +791,14 @@ internal JsonTypeInfo JsonTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 Debug.Assert(_jsonTypeInfo?.IsConfigured == true);
 return _jsonTypeInfo;
 Debug.Assert(_jsonTypeInfo?.IsConfigurationStarted == true);
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo jsonTypeInfo = _jsonTypeInfo;
 jsonTypeInfo.EnsureConfigured();
 return jsonTypeInfo;
 }
 set
 {
Expand Down

19 changes: 17 additions & 2 deletions
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -322,7 +322,14 @@ internal JsonTypeInfo? ElementTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _elementTypeInfo;
 Debug.Assert(_elementTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? elementTypeInfo = _elementTypeInfo;
 elementTypeInfo?.EnsureConfigured();
 return elementTypeInfo;
 }
 set
 {
Expand All@@ -340,7 +347,14 @@ internal JsonTypeInfo? KeyTypeInfo
 get
 {
 Debug.Assert(IsConfigured);
 return _keyTypeInfo;
 Debug.Assert(_keyTypeInfo is null or { IsConfigurationStarted: true });
 // Even though this instance has already been configured,
 // it is possible for contending threads to call the property
 // while the wider JsonTypeInfo graph is still being configured.
 // Call EnsureConfigured() to force synchronization if necessary.
 JsonTypeInfo? keyTypeInfo = _keyTypeInfo;
 keyTypeInfo?.EnsureConfigured();
 return keyTypeInfo;
 }
 set
 {
Expand DownExpand Up@@ -491,6 +505,7 @@ internal void VerifyMutable()
 }

 internal bool IsConfigured => _configurationState == ConfigurationState.Configured;
 internal bool IsConfigurationStarted => _configurationState is not ConfigurationState.NotConfigured;
 private volatile ConfigurationState _configurationState;
 private enum ConfigurationState : byte { NotConfigured = 0, Configuring = 1, Configured = 2 };

Expand Down