Skip to content

Commit

Permalink
Fixed crash in !windex -tree when type name is over 4,000 characters
Browse files Browse the repository at this point in the history
  • Loading branch information
rodneyviana committed Oct 21, 2020
1 parent f77b5d9 commit a70b8b1
Show file tree
Hide file tree
Showing 20 changed files with 11 additions and 6 deletions.
File renamed without changes.
Binary file added Binaries/NetExt-2.1.58.5000.zip
Binary file not shown.
Binary file modified Binaries/README.md
Binary file not shown.
Binary file modified Binaries/x64/NetExt.dll
Binary file not shown.
Binary file modified Binaries/x64/NetExt.pdb
Binary file not shown.
Binary file modified Binaries/x64/NetExtShim.dll
Binary file not shown.
Binary file modified Binaries/x64/NetExtShim.pdb
Binary file not shown.
Binary file modified Binaries/x86/NetExt.dll
Binary file not shown.
Binary file modified Binaries/x86/NetExtShim.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions ClrMemDiagExt/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f12c38b7-0893-4208-ab3d-54c3f8d1c01e")]

[assembly: AssemblyVersion("2.1.57.5000")]
[assembly: AssemblyFileVersion("2.1.57.5000")]
[assembly: AssemblyVersion("2.1.58.5000")]
[assembly: AssemblyFileVersion("2.1.58.5000")]
6 changes: 3 additions & 3 deletions NetExt/Indexer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ void Indexer::DumpTypesTree(EXT_CLASS *Ext)
{
char fileName[MAX_PATH];
char pathName[MAX_PATH];
char tempCmd[MAX_MTNAME*2+1];
char tempCmd[MAX_MTNAME*3+1];
ofstream treeStream;
DWORD hr;

Expand Down Expand Up @@ -175,7 +175,7 @@ void Indexer::DumpTypesTree(EXT_CLASS *Ext)

while(tt!=typeT.end())
{
sprintf_s(tempCmd, MAX_MTNAME*2, " {\"%p %S (%i)\"} {\"!windex -mt %p\"}\n", tt->second, mtT[tt->second].typeName.c_str(),
sprintf_s(tempCmd, MAX_MTNAME*3, " {\"%p %S (%i)\"} {\"!windex -mt %p\"}\n", tt->second, mtT[tt->second].typeName.c_str(),
mtT[tt->second].Addresses.size(), tt->second);
treeStream << tempCmd;
EEClass cl;
Expand All @@ -184,7 +184,7 @@ void Indexer::DumpTypesTree(EXT_CLASS *Ext)
std::vector<FieldStore> fields=cl.Fields();
for(int i=0;i<fields.size();i++)
{
sprintf_s(tempCmd, MAX_MTNAME* 2, " {\"%S (%S) +0n%u Token: %x\"} {\".foreach({$addr} {!windex -short -mt %p}){.echo Address: {$addr}; !wselect %S from {$addr}}\"}\n", fields[i].FieldName.c_str(), fields[i].mtName.c_str(),
sprintf_s(tempCmd, MAX_MTNAME* 3, " {\"%S (%S) +0n%u Token: %x\"} {\".foreach({$addr} {!windex -short -mt %p}){.echo Address: {$addr}; !wselect %S from {$addr}}\"}\n", fields[i].FieldName.c_str(), fields[i].mtName.c_str(),
fields[i].FieldDesc.offset, fields[i].FieldDesc.token, tt->second, fields[i].FieldName.c_str());
treeStream << tempCmd;
}
Expand Down
Binary file modified NetExt/Release32/CL.read.1.tlog
Binary file not shown.
Binary file modified NetExt/Release32/NetExt.res
Binary file not shown.
5 changes: 5 additions & 0 deletions NetExt/Release32/NetExt.write.1.tlog
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,8 @@ C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp
^C:\Users\rviana\OneDrive\Projects\netext\NetExt\NetExt.vcxproj
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp
C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp
2 changes: 1 addition & 1 deletion NetExt/VersionInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#ifndef ver_major
#define ver_major 2
#define ver_minor 1
#define ver_release 57
#define ver_release 58
#define ver_build 5000
#define ver_all(a,b,c,d) a,b,c,d
#define ver_expand(s) #s
Expand Down
Binary file modified README.md
Binary file not shown.
Binary file modified Release32/NetExt.exp
Binary file not shown.
Binary file modified Release32/NetExt.lib
Binary file not shown.
Binary file modified x86/Release32/NetExt.dll
Binary file not shown.
Binary file modified x86/Release32/NetExtShim.dll
Binary file not shown.

0 comments on commit a70b8b1

Please sign in to comment.