Skip to content

[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655

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
carlossanlop merged 1 commit into from
Aug 16, 2023
Merged

[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
84 changes: 69 additions & 15 deletions src/coreclr/ilasm/assem.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1324,7 +1324,12 @@ OPCODE Assembler::DecodeOpcode(const BYTE *pCode, DWORD *pdwLen)

char* Assembler::ReflectionNotation(mdToken tk)
{
// We break the global static `wzUniBuf` into 2 equal parts: the first part is used for a Unicode
// string, the second part is used for a converted-into-multibyte (MB) string. Note that the MB string
// length is in bytes.
char *sz = (char*)&wzUniBuf[dwUniBuf>>1], *pc;
const size_t szSizeBytes = (dwUniBuf * sizeof(WCHAR)) / 2; // sizeof(WCHAR) is 2, so this is just `dwUniBuf`
const size_t cchUniBuf = dwUniBuf / 2; // only use the first 1/2 of wzUniBuf
*sz=0;
switch(TypeFromToken(tk))
{
Expand All@@ -1333,7 +1338,7 @@ char* Assembler::ReflectionNotation(mdToken tk)
Class *pClass = m_lstClass.PEEK(RidFromToken(tk)-1);
if(pClass)
{
strcpy_s(sz,dwUniBuf>>1,pClass->m_szFQN);
strcpy_s(sz,szSizeBytes,pClass->m_szFQN);
pc = sz;
while((pc = strchr(pc,NESTING_SEP)) != NULL)
{
Expand All@@ -1348,31 +1353,80 @@ char* Assembler::ReflectionNotation(mdToken tk)
{
ULONG N;
mdToken tkResScope;
if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,dwUniBuf>>1,&N)))
if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,cchUniBuf,&N)))
{
WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,dwUniBuf>>1,NULL,NULL);
int ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,szSizeBytes,NULL,NULL);
if(TypeFromToken(tkResScope)==mdtAssemblyRef)
{
AsmManAssembly *pAsmRef = m_pManifest->m_AsmRefLst.PEEK(RidFromToken(tkResScope)-1);
if(pAsmRef)
{
pc = &sz[strlen(sz)];
pc+=sprintf_s(pc,(dwUniBuf >> 1),", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
// We assume below that if sprintf_s fails due to buffer overrun,
// execution fails fast and sprintf_s doesn't return.
int sprintf_ret;
const size_t szLen = strlen(sz);
pc = &sz[szLen];
size_t szRemainingSizeBytes = szSizeBytes - szLen;

sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
pAsmRef->usVerMajor,pAsmRef->usVerMinor,pAsmRef->usBuild,pAsmRef->usRevision);
ULONG L=0;
if(pAsmRef->pLocale && (L=pAsmRef->pLocale->length()))
pc += sprintf_ret;
szRemainingSizeBytes -= (size_t)sprintf_ret;

unsigned L=0;
if(pAsmRef->pLocale && ((L=pAsmRef->pLocale->length()) > 0))
{
// L is in bytes and doesn't include the terminating null.
if (L > (cchUniBuf - 1) * sizeof(WCHAR))
{
report->error("Locale too long (%d characters, %d allowed).\n",L / sizeof(WCHAR), cchUniBuf - 1);
*sz=0;
break;
}
else if (szRemainingSizeBytes == 0)
{
report->error("TypeRef too long.\n");
*sz=0;
break;
}

if (szRemainingSizeBytes > 0)
{
memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
wzUniBuf[L>>1] = 0;
ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,(int)szRemainingSizeBytes,NULL,NULL);
if (ret <= 0)
{
report->error("Locale too long.\n");
*sz=0;
break;
}
else
{
pc += ret;
szRemainingSizeBytes -= (size_t)ret;
}
}
}
else
{
memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
wzUniBuf[L>>1] = 0;
WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,dwUniBuf>>1,NULL,NULL);
sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"neutral");
pc += sprintf_ret;
szRemainingSizeBytes -= (size_t)sprintf_ret;
}
else pc+=sprintf_s(pc,(dwUniBuf >> 1),"neutral");
pc = &sz[strlen(sz)];
if(pAsmRef->pPublicKeyToken && (L=pAsmRef->pPublicKeyToken->length()))
if(pAsmRef->pPublicKeyToken && ((L=pAsmRef->pPublicKeyToken->length()) > 0))
{
pc+=sprintf_s(pc,(dwUniBuf >> 1),", Publickeytoken=");
sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", Publickeytoken=");
pc += sprintf_ret;
szRemainingSizeBytes -= (size_t)sprintf_ret;

BYTE* pb = (BYTE*)(pAsmRef->pPublicKeyToken->ptr());
for(N=0; N<L; N++,pb++) pc+=sprintf_s(pc,(dwUniBuf >> 1),"%2.2x",*pb);
for(unsigned i=0; i<L; i++,pb++)
{
sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"%2.2x",*pb);
pc += sprintf_ret;
szRemainingSizeBytes -= (size_t)sprintf_ret;
}
}
}
}
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" + '
[release/8.0-rc1] Fix problems with `Assembler::ReflectionNotation()` by github-actions[bot] · Pull Request #90655 · dotnet/runtime · GitHub
Skip to content
[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655

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

carlossanlop
merged 1 commit into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


84 changes: 69 additions & 15 deletions
src/coreclr/ilasm/assem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1324,7 +1324,12 @@ OPCODE Assembler::DecodeOpcode(const BYTE *pCode, DWORD *pdwLen)

char* Assembler::ReflectionNotation(mdToken tk)
{
 // We break the global static `wzUniBuf` into 2 equal parts: the first part is used for a Unicode
 // string, the second part is used for a converted-into-multibyte (MB) string. Note that the MB string
 // length is in bytes.
 char *sz = (char*)&wzUniBuf[dwUniBuf>>1], *pc;
 const size_t szSizeBytes = (dwUniBuf * sizeof(WCHAR)) / 2; // sizeof(WCHAR) is 2, so this is just `dwUniBuf`
 const size_t cchUniBuf = dwUniBuf / 2; // only use the first 1/2 of wzUniBuf
 *sz=0;
 switch(TypeFromToken(tk))
 {
Expand All@@ -1333,7 +1338,7 @@ char* Assembler::ReflectionNotation(mdToken tk)
 Class *pClass = m_lstClass.PEEK(RidFromToken(tk)-1);
 if(pClass)
 {
 strcpy_s(sz,dwUniBuf>>1,pClass->m_szFQN);
 strcpy_s(sz,szSizeBytes,pClass->m_szFQN);
 pc = sz;
 while((pc = strchr(pc,NESTING_SEP)) != NULL)
 {
Expand All@@ -1348,31 +1353,80 @@ char* Assembler::ReflectionNotation(mdToken tk)
 {
 ULONG N;
 mdToken tkResScope;
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,dwUniBuf>>1,&N)))
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,cchUniBuf,&N)))
 {
 WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,dwUniBuf>>1,NULL,NULL);
int ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,szSizeBytes,NULL,NULL);
 if(TypeFromToken(tkResScope)==mdtAssemblyRef)
 {
 AsmManAssembly *pAsmRef = m_pManifest->m_AsmRefLst.PEEK(RidFromToken(tkResScope)-1);
 if(pAsmRef)
 {
 pc = &sz[strlen(sz)];
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 // We assume below that if sprintf_s fails due to buffer overrun,
 // execution fails fast and sprintf_s doesn't return.
 int sprintf_ret;
 const size_t szLen = strlen(sz);
 pc = &sz[szLen];
 size_t szRemainingSizeBytes = szSizeBytes - szLen;

 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 pAsmRef->usVerMajor,pAsmRef->usVerMinor,pAsmRef->usBuild,pAsmRef->usRevision);
 ULONG L=0;
 if(pAsmRef->pLocale && (L=pAsmRef->pLocale->length()))
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 unsigned L=0;
 if(pAsmRef->pLocale && ((L=pAsmRef->pLocale->length()) > 0))
 {
 // L is in bytes and doesn't include the terminating null.
 if (L > (cchUniBuf - 1) * sizeof(WCHAR))
 {
 report->error("Locale too long (%d characters, %d allowed).\n",L / sizeof(WCHAR), cchUniBuf - 1);
 *sz=0;
 break;
 }
 else if (szRemainingSizeBytes == 0)
 {
 report->error("TypeRef too long.\n");
 *sz=0;
 break;
 }

 if (szRemainingSizeBytes > 0)
 {
 memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
 wzUniBuf[L>>1] = 0;
 ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,(int)szRemainingSizeBytes,NULL,NULL);
 if (ret <= 0)
 {
 report->error("Locale too long.\n");
 *sz=0;
 break;
 }
 else
 {
 pc += ret;
 szRemainingSizeBytes -= (size_t)ret;
 }
 }
 }
 else
 {
memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
wzUniBuf[L>>1] = 0;
WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,dwUniBuf>>1,NULL,NULL);
sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"neutral");
pc += sprintf_ret;
szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 else pc+=sprintf_s(pc,(dwUniBuf >> 1),"neutral");
 pc = &sz[strlen(sz)];
 if(pAsmRef->pPublicKeyToken && (L=pAsmRef->pPublicKeyToken->length()))
 if(pAsmRef->pPublicKeyToken && ((L=pAsmRef->pPublicKeyToken->length()) > 0))
 {
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", Publickeytoken=");
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", Publickeytoken=");
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 BYTE* pb = (BYTE*)(pAsmRef->pPublicKeyToken->ptr());
 for(N=0; N<L; N++,pb++) pc+=sprintf_s(pc,(dwUniBuf >> 1),"%2.2x",*pb);
 for(unsigned i=0; i<L; i++,pb++)
 {
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"%2.2x",*pb);
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 }
 }
 }
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('^' + ".*" + '
[release/8.0-rc1] Fix problems with `Assembler::ReflectionNotation()` by github-actions[bot] · Pull Request #90655 · dotnet/runtime · GitHub
Skip to content
[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655

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

carlossanlop
merged 1 commit into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


84 changes: 69 additions & 15 deletions
src/coreclr/ilasm/assem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1324,7 +1324,12 @@ OPCODE Assembler::DecodeOpcode(const BYTE *pCode, DWORD *pdwLen)

char* Assembler::ReflectionNotation(mdToken tk)
{
 // We break the global static `wzUniBuf` into 2 equal parts: the first part is used for a Unicode
 // string, the second part is used for a converted-into-multibyte (MB) string. Note that the MB string
 // length is in bytes.
 char *sz = (char*)&wzUniBuf[dwUniBuf>>1], *pc;
 const size_t szSizeBytes = (dwUniBuf * sizeof(WCHAR)) / 2; // sizeof(WCHAR) is 2, so this is just `dwUniBuf`
 const size_t cchUniBuf = dwUniBuf / 2; // only use the first 1/2 of wzUniBuf
 *sz=0;
 switch(TypeFromToken(tk))
 {
Expand All@@ -1333,7 +1338,7 @@ char* Assembler::ReflectionNotation(mdToken tk)
 Class *pClass = m_lstClass.PEEK(RidFromToken(tk)-1);
 if(pClass)
 {
 strcpy_s(sz,dwUniBuf>>1,pClass->m_szFQN);
 strcpy_s(sz,szSizeBytes,pClass->m_szFQN);
 pc = sz;
 while((pc = strchr(pc,NESTING_SEP)) != NULL)
 {
Expand All@@ -1348,31 +1353,80 @@ char* Assembler::ReflectionNotation(mdToken tk)
 {
 ULONG N;
 mdToken tkResScope;
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,dwUniBuf>>1,&N)))
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,cchUniBuf,&N)))
 {
 WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,dwUniBuf>>1,NULL,NULL);
int ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,szSizeBytes,NULL,NULL);
 if(TypeFromToken(tkResScope)==mdtAssemblyRef)
 {
 AsmManAssembly *pAsmRef = m_pManifest->m_AsmRefLst.PEEK(RidFromToken(tkResScope)-1);
 if(pAsmRef)
 {
 pc = &sz[strlen(sz)];
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 // We assume below that if sprintf_s fails due to buffer overrun,
 // execution fails fast and sprintf_s doesn't return.
 int sprintf_ret;
 const size_t szLen = strlen(sz);
 pc = &sz[szLen];
 size_t szRemainingSizeBytes = szSizeBytes - szLen;

 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 pAsmRef->usVerMajor,pAsmRef->usVerMinor,pAsmRef->usBuild,pAsmRef->usRevision);
 ULONG L=0;
 if(pAsmRef->pLocale && (L=pAsmRef->pLocale->length()))
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 unsigned L=0;
 if(pAsmRef->pLocale && ((L=pAsmRef->pLocale->length()) > 0))
 {
 // L is in bytes and doesn't include the terminating null.
 if (L > (cchUniBuf - 1) * sizeof(WCHAR))
 {
 report->error("Locale too long (%d characters, %d allowed).\n",L / sizeof(WCHAR), cchUniBuf - 1);
 *sz=0;
 break;
 }
 else if (szRemainingSizeBytes == 0)
 {
 report->error("TypeRef too long.\n");
 *sz=0;
 break;
 }

 if (szRemainingSizeBytes > 0)
 {
 memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
 wzUniBuf[L>>1] = 0;
 ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,(int)szRemainingSizeBytes,NULL,NULL);
 if (ret <= 0)
 {
 report->error("Locale too long.\n");
 *sz=0;
 break;
 }
 else
 {
 pc += ret;
 szRemainingSizeBytes -= (size_t)ret;
 }
 }
 }
 else
 {
memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
wzUniBuf[L>>1] = 0;
WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,dwUniBuf>>1,NULL,NULL);
sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"neutral");
pc += sprintf_ret;
szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 else pc+=sprintf_s(pc,(dwUniBuf >> 1),"neutral");
 pc = &sz[strlen(sz)];
 if(pAsmRef->pPublicKeyToken && (L=pAsmRef->pPublicKeyToken->length()))
 if(pAsmRef->pPublicKeyToken && ((L=pAsmRef->pPublicKeyToken->length()) > 0))
 {
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", Publickeytoken=");
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", Publickeytoken=");
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 BYTE* pb = (BYTE*)(pAsmRef->pPublicKeyToken->ptr());
 for(N=0; N<L; N++,pb++) pc+=sprintf_s(pc,(dwUniBuf >> 1),"%2.2x",*pb);
 for(unsigned i=0; i<L; i++,pb++)
 {
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"%2.2x",*pb);
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 }
 }
 }
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('^' + ".*" + '
[release/8.0-rc1] Fix problems with `Assembler::ReflectionNotation()` by github-actions[bot] · Pull Request #90655 · dotnet/runtime · GitHub
Skip to content
[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655

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

carlossanlop
merged 1 commit into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


84 changes: 69 additions & 15 deletions
src/coreclr/ilasm/assem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1324,7 +1324,12 @@ OPCODE Assembler::DecodeOpcode(const BYTE *pCode, DWORD *pdwLen)

char* Assembler::ReflectionNotation(mdToken tk)
{
 // We break the global static `wzUniBuf` into 2 equal parts: the first part is used for a Unicode
 // string, the second part is used for a converted-into-multibyte (MB) string. Note that the MB string
 // length is in bytes.
 char *sz = (char*)&wzUniBuf[dwUniBuf>>1], *pc;
 const size_t szSizeBytes = (dwUniBuf * sizeof(WCHAR)) / 2; // sizeof(WCHAR) is 2, so this is just `dwUniBuf`
 const size_t cchUniBuf = dwUniBuf / 2; // only use the first 1/2 of wzUniBuf
 *sz=0;
 switch(TypeFromToken(tk))
 {
Expand All@@ -1333,7 +1338,7 @@ char* Assembler::ReflectionNotation(mdToken tk)
 Class *pClass = m_lstClass.PEEK(RidFromToken(tk)-1);
 if(pClass)
 {
 strcpy_s(sz,dwUniBuf>>1,pClass->m_szFQN);
 strcpy_s(sz,szSizeBytes,pClass->m_szFQN);
 pc = sz;
 while((pc = strchr(pc,NESTING_SEP)) != NULL)
 {
Expand All@@ -1348,31 +1353,80 @@ char* Assembler::ReflectionNotation(mdToken tk)
 {
 ULONG N;
 mdToken tkResScope;
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,dwUniBuf>>1,&N)))
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,cchUniBuf,&N)))
 {
 WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,dwUniBuf>>1,NULL,NULL);
int ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,szSizeBytes,NULL,NULL);
 if(TypeFromToken(tkResScope)==mdtAssemblyRef)
 {
 AsmManAssembly *pAsmRef = m_pManifest->m_AsmRefLst.PEEK(RidFromToken(tkResScope)-1);
 if(pAsmRef)
 {
 pc = &sz[strlen(sz)];
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 // We assume below that if sprintf_s fails due to buffer overrun,
 // execution fails fast and sprintf_s doesn't return.
 int sprintf_ret;
 const size_t szLen = strlen(sz);
 pc = &sz[szLen];
 size_t szRemainingSizeBytes = szSizeBytes - szLen;

 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 pAsmRef->usVerMajor,pAsmRef->usVerMinor,pAsmRef->usBuild,pAsmRef->usRevision);
 ULONG L=0;
 if(pAsmRef->pLocale && (L=pAsmRef->pLocale->length()))
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 unsigned L=0;
 if(pAsmRef->pLocale && ((L=pAsmRef->pLocale->length()) > 0))
 {
 // L is in bytes and doesn't include the terminating null.
 if (L > (cchUniBuf - 1) * sizeof(WCHAR))
 {
 report->error("Locale too long (%d characters, %d allowed).\n",L / sizeof(WCHAR), cchUniBuf - 1);
 *sz=0;
 break;
 }
 else if (szRemainingSizeBytes == 0)
 {
 report->error("TypeRef too long.\n");
 *sz=0;
 break;
 }

 if (szRemainingSizeBytes > 0)
 {
 memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
 wzUniBuf[L>>1] = 0;
 ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,(int)szRemainingSizeBytes,NULL,NULL);
 if (ret <= 0)
 {
 report->error("Locale too long.\n");
 *sz=0;
 break;
 }
 else
 {
 pc += ret;
 szRemainingSizeBytes -= (size_t)ret;
 }
 }
 }
 else
 {
memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
wzUniBuf[L>>1] = 0;
WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,dwUniBuf>>1,NULL,NULL);
sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"neutral");
pc += sprintf_ret;
szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 else pc+=sprintf_s(pc,(dwUniBuf >> 1),"neutral");
 pc = &sz[strlen(sz)];
 if(pAsmRef->pPublicKeyToken && (L=pAsmRef->pPublicKeyToken->length()))
 if(pAsmRef->pPublicKeyToken && ((L=pAsmRef->pPublicKeyToken->length()) > 0))
 {
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", Publickeytoken=");
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", Publickeytoken=");
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 BYTE* pb = (BYTE*)(pAsmRef->pPublicKeyToken->ptr());
 for(N=0; N<L; N++,pb++) pc+=sprintf_s(pc,(dwUniBuf >> 1),"%2.2x",*pb);
 for(unsigned i=0; i<L; i++,pb++)
 {
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"%2.2x",*pb);
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 }
 }
 }
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" + '
[release/8.0-rc1] Fix problems with `Assembler::ReflectionNotation()` by github-actions[bot] · Pull Request #90655 · dotnet/runtime · GitHub
Skip to content
[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655

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

carlossanlop
merged 1 commit into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


84 changes: 69 additions & 15 deletions
src/coreclr/ilasm/assem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1324,7 +1324,12 @@ OPCODE Assembler::DecodeOpcode(const BYTE *pCode, DWORD *pdwLen)

char* Assembler::ReflectionNotation(mdToken tk)
{
 // We break the global static `wzUniBuf` into 2 equal parts: the first part is used for a Unicode
 // string, the second part is used for a converted-into-multibyte (MB) string. Note that the MB string
 // length is in bytes.
 char *sz = (char*)&wzUniBuf[dwUniBuf>>1], *pc;
 const size_t szSizeBytes = (dwUniBuf * sizeof(WCHAR)) / 2; // sizeof(WCHAR) is 2, so this is just `dwUniBuf`
 const size_t cchUniBuf = dwUniBuf / 2; // only use the first 1/2 of wzUniBuf
 *sz=0;
 switch(TypeFromToken(tk))
 {
Expand All@@ -1333,7 +1338,7 @@ char* Assembler::ReflectionNotation(mdToken tk)
 Class *pClass = m_lstClass.PEEK(RidFromToken(tk)-1);
 if(pClass)
 {
 strcpy_s(sz,dwUniBuf>>1,pClass->m_szFQN);
 strcpy_s(sz,szSizeBytes,pClass->m_szFQN);
 pc = sz;
 while((pc = strchr(pc,NESTING_SEP)) != NULL)
 {
Expand All@@ -1348,31 +1353,80 @@ char* Assembler::ReflectionNotation(mdToken tk)
 {
 ULONG N;
 mdToken tkResScope;
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,dwUniBuf>>1,&N)))
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,cchUniBuf,&N)))
 {
 WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,dwUniBuf>>1,NULL,NULL);
int ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,szSizeBytes,NULL,NULL);
 if(TypeFromToken(tkResScope)==mdtAssemblyRef)
 {
 AsmManAssembly *pAsmRef = m_pManifest->m_AsmRefLst.PEEK(RidFromToken(tkResScope)-1);
 if(pAsmRef)
 {
 pc = &sz[strlen(sz)];
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 // We assume below that if sprintf_s fails due to buffer overrun,
 // execution fails fast and sprintf_s doesn't return.
 int sprintf_ret;
 const size_t szLen = strlen(sz);
 pc = &sz[szLen];
 size_t szRemainingSizeBytes = szSizeBytes - szLen;

 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 pAsmRef->usVerMajor,pAsmRef->usVerMinor,pAsmRef->usBuild,pAsmRef->usRevision);
 ULONG L=0;
 if(pAsmRef->pLocale && (L=pAsmRef->pLocale->length()))
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 unsigned L=0;
 if(pAsmRef->pLocale && ((L=pAsmRef->pLocale->length()) > 0))
 {
 // L is in bytes and doesn't include the terminating null.
 if (L > (cchUniBuf - 1) * sizeof(WCHAR))
 {
 report->error("Locale too long (%d characters, %d allowed).\n",L / sizeof(WCHAR), cchUniBuf - 1);
 *sz=0;
 break;
 }
 else if (szRemainingSizeBytes == 0)
 {
 report->error("TypeRef too long.\n");
 *sz=0;
 break;
 }

 if (szRemainingSizeBytes > 0)
 {
 memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
 wzUniBuf[L>>1] = 0;
 ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,(int)szRemainingSizeBytes,NULL,NULL);
 if (ret <= 0)
 {
 report->error("Locale too long.\n");
 *sz=0;
 break;
 }
 else
 {
 pc += ret;
 szRemainingSizeBytes -= (size_t)ret;
 }
 }
 }
 else
 {
memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
wzUniBuf[L>>1] = 0;
WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,dwUniBuf>>1,NULL,NULL);
sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"neutral");
pc += sprintf_ret;
szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 else pc+=sprintf_s(pc,(dwUniBuf >> 1),"neutral");
 pc = &sz[strlen(sz)];
 if(pAsmRef->pPublicKeyToken && (L=pAsmRef->pPublicKeyToken->length()))
 if(pAsmRef->pPublicKeyToken && ((L=pAsmRef->pPublicKeyToken->length()) > 0))
 {
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", Publickeytoken=");
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", Publickeytoken=");
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 BYTE* pb = (BYTE*)(pAsmRef->pPublicKeyToken->ptr());
 for(N=0; N<L; N++,pb++) pc+=sprintf_s(pc,(dwUniBuf >> 1),"%2.2x",*pb);
 for(unsigned i=0; i<L; i++,pb++)
 {
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"%2.2x",*pb);
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 }
 }
 }
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('^' + ".*" + '
[release/8.0-rc1] Fix problems with `Assembler::ReflectionNotation()` by github-actions[bot] · Pull Request #90655 · dotnet/runtime · GitHub
Skip to content
[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655

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

carlossanlop
merged 1 commit into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


84 changes: 69 additions & 15 deletions
src/coreclr/ilasm/assem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1324,7 +1324,12 @@ OPCODE Assembler::DecodeOpcode(const BYTE *pCode, DWORD *pdwLen)

char* Assembler::ReflectionNotation(mdToken tk)
{
 // We break the global static `wzUniBuf` into 2 equal parts: the first part is used for a Unicode
 // string, the second part is used for a converted-into-multibyte (MB) string. Note that the MB string
 // length is in bytes.
 char *sz = (char*)&wzUniBuf[dwUniBuf>>1], *pc;
 const size_t szSizeBytes = (dwUniBuf * sizeof(WCHAR)) / 2; // sizeof(WCHAR) is 2, so this is just `dwUniBuf`
 const size_t cchUniBuf = dwUniBuf / 2; // only use the first 1/2 of wzUniBuf
 *sz=0;
 switch(TypeFromToken(tk))
 {
Expand All@@ -1333,7 +1338,7 @@ char* Assembler::ReflectionNotation(mdToken tk)
 Class *pClass = m_lstClass.PEEK(RidFromToken(tk)-1);
 if(pClass)
 {
 strcpy_s(sz,dwUniBuf>>1,pClass->m_szFQN);
 strcpy_s(sz,szSizeBytes,pClass->m_szFQN);
 pc = sz;
 while((pc = strchr(pc,NESTING_SEP)) != NULL)
 {
Expand All@@ -1348,31 +1353,80 @@ char* Assembler::ReflectionNotation(mdToken tk)
 {
 ULONG N;
 mdToken tkResScope;
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,dwUniBuf>>1,&N)))
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,cchUniBuf,&N)))
 {
 WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,dwUniBuf>>1,NULL,NULL);
int ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,szSizeBytes,NULL,NULL);
 if(TypeFromToken(tkResScope)==mdtAssemblyRef)
 {
 AsmManAssembly *pAsmRef = m_pManifest->m_AsmRefLst.PEEK(RidFromToken(tkResScope)-1);
 if(pAsmRef)
 {
 pc = &sz[strlen(sz)];
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 // We assume below that if sprintf_s fails due to buffer overrun,
 // execution fails fast and sprintf_s doesn't return.
 int sprintf_ret;
 const size_t szLen = strlen(sz);
 pc = &sz[szLen];
 size_t szRemainingSizeBytes = szSizeBytes - szLen;

 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 pAsmRef->usVerMajor,pAsmRef->usVerMinor,pAsmRef->usBuild,pAsmRef->usRevision);
 ULONG L=0;
 if(pAsmRef->pLocale && (L=pAsmRef->pLocale->length()))
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 unsigned L=0;
 if(pAsmRef->pLocale && ((L=pAsmRef->pLocale->length()) > 0))
 {
 // L is in bytes and doesn't include the terminating null.
 if (L > (cchUniBuf - 1) * sizeof(WCHAR))
 {
 report->error("Locale too long (%d characters, %d allowed).\n",L / sizeof(WCHAR), cchUniBuf - 1);
 *sz=0;
 break;
 }
 else if (szRemainingSizeBytes == 0)
 {
 report->error("TypeRef too long.\n");
 *sz=0;
 break;
 }

 if (szRemainingSizeBytes > 0)
 {
 memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
 wzUniBuf[L>>1] = 0;
 ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,(int)szRemainingSizeBytes,NULL,NULL);
 if (ret <= 0)
 {
 report->error("Locale too long.\n");
 *sz=0;
 break;
 }
 else
 {
 pc += ret;
 szRemainingSizeBytes -= (size_t)ret;
 }
 }
 }
 else
 {
memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
wzUniBuf[L>>1] = 0;
WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,dwUniBuf>>1,NULL,NULL);
sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"neutral");
pc += sprintf_ret;
szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 else pc+=sprintf_s(pc,(dwUniBuf >> 1),"neutral");
 pc = &sz[strlen(sz)];
 if(pAsmRef->pPublicKeyToken && (L=pAsmRef->pPublicKeyToken->length()))
 if(pAsmRef->pPublicKeyToken && ((L=pAsmRef->pPublicKeyToken->length()) > 0))
 {
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", Publickeytoken=");
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", Publickeytoken=");
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 BYTE* pb = (BYTE*)(pAsmRef->pPublicKeyToken->ptr());
 for(N=0; N<L; N++,pb++) pc+=sprintf_s(pc,(dwUniBuf >> 1),"%2.2x",*pb);
 for(unsigned i=0; i<L; i++,pb++)
 {
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"%2.2x",*pb);
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 }
 }
 }
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); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[release/8.0-rc1] Fix problems with `Assembler::ReflectionNotation()` by github-actions[bot] · Pull Request #90655 · dotnet/runtime · GitHub
Skip to content
[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655

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

carlossanlop
merged 1 commit into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


84 changes: 69 additions & 15 deletions
src/coreclr/ilasm/assem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1324,7 +1324,12 @@ OPCODE Assembler::DecodeOpcode(const BYTE *pCode, DWORD *pdwLen)

char* Assembler::ReflectionNotation(mdToken tk)
{
 // We break the global static `wzUniBuf` into 2 equal parts: the first part is used for a Unicode
 // string, the second part is used for a converted-into-multibyte (MB) string. Note that the MB string
 // length is in bytes.
 char *sz = (char*)&wzUniBuf[dwUniBuf>>1], *pc;
 const size_t szSizeBytes = (dwUniBuf * sizeof(WCHAR)) / 2; // sizeof(WCHAR) is 2, so this is just `dwUniBuf`
 const size_t cchUniBuf = dwUniBuf / 2; // only use the first 1/2 of wzUniBuf
 *sz=0;
 switch(TypeFromToken(tk))
 {
Expand All@@ -1333,7 +1338,7 @@ char* Assembler::ReflectionNotation(mdToken tk)
 Class *pClass = m_lstClass.PEEK(RidFromToken(tk)-1);
 if(pClass)
 {
 strcpy_s(sz,dwUniBuf>>1,pClass->m_szFQN);
 strcpy_s(sz,szSizeBytes,pClass->m_szFQN);
 pc = sz;
 while((pc = strchr(pc,NESTING_SEP)) != NULL)
 {
Expand All@@ -1348,31 +1353,80 @@ char* Assembler::ReflectionNotation(mdToken tk)
 {
 ULONG N;
 mdToken tkResScope;
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,dwUniBuf>>1,&N)))
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,cchUniBuf,&N)))
 {
 WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,dwUniBuf>>1,NULL,NULL);
int ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,szSizeBytes,NULL,NULL);
 if(TypeFromToken(tkResScope)==mdtAssemblyRef)
 {
 AsmManAssembly *pAsmRef = m_pManifest->m_AsmRefLst.PEEK(RidFromToken(tkResScope)-1);
 if(pAsmRef)
 {
 pc = &sz[strlen(sz)];
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 // We assume below that if sprintf_s fails due to buffer overrun,
 // execution fails fast and sprintf_s doesn't return.
 int sprintf_ret;
 const size_t szLen = strlen(sz);
 pc = &sz[szLen];
 size_t szRemainingSizeBytes = szSizeBytes - szLen;

 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 pAsmRef->usVerMajor,pAsmRef->usVerMinor,pAsmRef->usBuild,pAsmRef->usRevision);
 ULONG L=0;
 if(pAsmRef->pLocale && (L=pAsmRef->pLocale->length()))
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 unsigned L=0;
 if(pAsmRef->pLocale && ((L=pAsmRef->pLocale->length()) > 0))
 {
 // L is in bytes and doesn't include the terminating null.
 if (L > (cchUniBuf - 1) * sizeof(WCHAR))
 {
 report->error("Locale too long (%d characters, %d allowed).\n",L / sizeof(WCHAR), cchUniBuf - 1);
 *sz=0;
 break;
 }
 else if (szRemainingSizeBytes == 0)
 {
 report->error("TypeRef too long.\n");
 *sz=0;
 break;
 }

 if (szRemainingSizeBytes > 0)
 {
 memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
 wzUniBuf[L>>1] = 0;
 ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,(int)szRemainingSizeBytes,NULL,NULL);
 if (ret <= 0)
 {
 report->error("Locale too long.\n");
 *sz=0;
 break;
 }
 else
 {
 pc += ret;
 szRemainingSizeBytes -= (size_t)ret;
 }
 }
 }
 else
 {
memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
wzUniBuf[L>>1] = 0;
WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,dwUniBuf>>1,NULL,NULL);
sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"neutral");
pc += sprintf_ret;
szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 else pc+=sprintf_s(pc,(dwUniBuf >> 1),"neutral");
 pc = &sz[strlen(sz)];
 if(pAsmRef->pPublicKeyToken && (L=pAsmRef->pPublicKeyToken->length()))
 if(pAsmRef->pPublicKeyToken && ((L=pAsmRef->pPublicKeyToken->length()) > 0))
 {
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", Publickeytoken=");
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", Publickeytoken=");
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 BYTE* pb = (BYTE*)(pAsmRef->pPublicKeyToken->ptr());
 for(N=0; N<L; N++,pb++) pc+=sprintf_s(pc,(dwUniBuf >> 1),"%2.2x",*pb);
 for(unsigned i=0; i<L; i++,pb++)
 {
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"%2.2x",*pb);
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 }
 }
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[release/8.0-rc1] Fix problems with `Assembler::ReflectionNotation()` by github-actions[bot] · Pull Request #90655 · dotnet/runtime · GitHub
Skip to content
[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655

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

carlossanlop
merged 1 commit into

from

Aug 16, 2023
 Merged


[release/8.0-rc1] Fix problems with Assembler::ReflectionNotation()#90655
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


84 changes: 69 additions & 15 deletions
src/coreclr/ilasm/assem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1324,7 +1324,12 @@ OPCODE Assembler::DecodeOpcode(const BYTE *pCode, DWORD *pdwLen)

char* Assembler::ReflectionNotation(mdToken tk)
{
 // We break the global static `wzUniBuf` into 2 equal parts: the first part is used for a Unicode
 // string, the second part is used for a converted-into-multibyte (MB) string. Note that the MB string
 // length is in bytes.
 char *sz = (char*)&wzUniBuf[dwUniBuf>>1], *pc;
 const size_t szSizeBytes = (dwUniBuf * sizeof(WCHAR)) / 2; // sizeof(WCHAR) is 2, so this is just `dwUniBuf`
 const size_t cchUniBuf = dwUniBuf / 2; // only use the first 1/2 of wzUniBuf
 *sz=0;
 switch(TypeFromToken(tk))
 {
Expand All@@ -1333,7 +1338,7 @@ char* Assembler::ReflectionNotation(mdToken tk)
 Class *pClass = m_lstClass.PEEK(RidFromToken(tk)-1);
 if(pClass)
 {
 strcpy_s(sz,dwUniBuf>>1,pClass->m_szFQN);
 strcpy_s(sz,szSizeBytes,pClass->m_szFQN);
 pc = sz;
 while((pc = strchr(pc,NESTING_SEP)) != NULL)
 {
Expand All@@ -1348,31 +1353,80 @@ char* Assembler::ReflectionNotation(mdToken tk)
 {
 ULONG N;
 mdToken tkResScope;
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,dwUniBuf>>1,&N)))
 if(SUCCEEDED(m_pImporter->GetTypeRefProps(tk,&tkResScope,wzUniBuf,cchUniBuf,&N)))
 {
 WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,dwUniBuf>>1,NULL,NULL);
int ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,sz,szSizeBytes,NULL,NULL);
 if(TypeFromToken(tkResScope)==mdtAssemblyRef)
 {
 AsmManAssembly *pAsmRef = m_pManifest->m_AsmRefLst.PEEK(RidFromToken(tkResScope)-1);
 if(pAsmRef)
 {
 pc = &sz[strlen(sz)];
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 // We assume below that if sprintf_s fails due to buffer overrun,
 // execution fails fast and sprintf_s doesn't return.
 int sprintf_ret;
 const size_t szLen = strlen(sz);
 pc = &sz[szLen];
 size_t szRemainingSizeBytes = szSizeBytes - szLen;

 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", %s, Version=%d.%d.%d.%d, Culture=",pAsmRef->szName,
 pAsmRef->usVerMajor,pAsmRef->usVerMinor,pAsmRef->usBuild,pAsmRef->usRevision);
 ULONG L=0;
 if(pAsmRef->pLocale && (L=pAsmRef->pLocale->length()))
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 unsigned L=0;
 if(pAsmRef->pLocale && ((L=pAsmRef->pLocale->length()) > 0))
 {
 // L is in bytes and doesn't include the terminating null.
 if (L > (cchUniBuf - 1) * sizeof(WCHAR))
 {
 report->error("Locale too long (%d characters, %d allowed).\n",L / sizeof(WCHAR), cchUniBuf - 1);
 *sz=0;
 break;
 }
 else if (szRemainingSizeBytes == 0)
 {
 report->error("TypeRef too long.\n");
 *sz=0;
 break;
 }

 if (szRemainingSizeBytes > 0)
 {
 memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
 wzUniBuf[L>>1] = 0;
 ret = WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,(int)szRemainingSizeBytes,NULL,NULL);
 if (ret <= 0)
 {
 report->error("Locale too long.\n");
 *sz=0;
 break;
 }
 else
 {
 pc += ret;
 szRemainingSizeBytes -= (size_t)ret;
 }
 }
 }
 else
 {
memcpy(wzUniBuf,pAsmRef->pLocale->ptr(),L);
wzUniBuf[L>>1] = 0;
WszWideCharToMultiByte(CP_UTF8,0,wzUniBuf,-1,pc,dwUniBuf>>1,NULL,NULL);
sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"neutral");
pc += sprintf_ret;
szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 else pc+=sprintf_s(pc,(dwUniBuf >> 1),"neutral");
 pc = &sz[strlen(sz)];
 if(pAsmRef->pPublicKeyToken && (L=pAsmRef->pPublicKeyToken->length()))
 if(pAsmRef->pPublicKeyToken && ((L=pAsmRef->pPublicKeyToken->length()) > 0))
 {
 pc+=sprintf_s(pc,(dwUniBuf >> 1),", Publickeytoken=");
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,", Publickeytoken=");
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;

 BYTE* pb = (BYTE*)(pAsmRef->pPublicKeyToken->ptr());
 for(N=0; N<L; N++,pb++) pc+=sprintf_s(pc,(dwUniBuf >> 1),"%2.2x",*pb);
 for(unsigned i=0; i<L; i++,pb++)
 {
 sprintf_ret = sprintf_s(pc,szRemainingSizeBytes,"%2.2x",*pb);
 pc += sprintf_ret;
 szRemainingSizeBytes -= (size_t)sprintf_ret;
 }
 }
 }
 }
Expand Down