Skip to content
/ cecil Public
forked from jbevain/cecil
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

Fix portable PDB stamp in CodeView header #32

Merged
merged 2 commits into from
Nov 29, 2021
Merged

Fix portable PDB stamp in CodeView header #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b323d0f
Fix how pdb path is calculated in the tests
vitek-karas Nov 12, 2021
c8be99b
Fix portable PDB stamp in CodeView header
vitek-karas Nov 29, 2021
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
10 changes: 5 additions & 5 deletions Mono.Cecil.Cil/PortablePdb.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public sealed class PortablePdbWriter : ISymbolWriter {

internal byte [] pdb_checksum;
internal Guid pdb_id_guid;
internal uint pdb_id_age;
internal uint pdb_id_stamp;

bool IsEmbedded { get { return writer == null; } }

Expand Down Expand Up @@ -324,7 +324,7 @@ public ImageDebugHeader GetDebugHeader ()
MajorVersion = 256,
MinorVersion = 20557,
Type = ImageDebugType.CodeView,
TimeDateStamp = (int)module.timestamp,
TimeDateStamp = (int)pdb_id_stamp,
};

var buffer = new ByteBuffer ();
Expand All @@ -333,7 +333,7 @@ public ImageDebugHeader GetDebugHeader ()
// Module ID
buffer.WriteBytes (pdb_id_guid.ToByteArray ());
// PDB Age
buffer.WriteUInt32 (pdb_id_age);
buffer.WriteUInt32 (1);
// PDB Path
var fileName = writer.BaseStream.GetFileName ();
if (string.IsNullOrEmpty (fileName)) {
Expand Down Expand Up @@ -462,15 +462,15 @@ void ComputeChecksumAndPdbId ()

var hashBytes = new ByteBuffer (pdb_checksum);
pdb_id_guid = new Guid (hashBytes.ReadBytes (16));
pdb_id_age = hashBytes.ReadUInt32 ();
pdb_id_stamp = hashBytes.ReadUInt32 ();
}

void WritePdbId ()
{
// PDB ID is the first 20 bytes of the PdbHeap
writer.MoveToRVA (TextSegment.PdbHeap);
writer.WriteBytes (pdb_id_guid.ToByteArray ());
writer.WriteUInt32 (pdb_id_age);
writer.WriteUInt32 (pdb_id_stamp);
}
}

Expand Down
38 changes: 30 additions & 8 deletions Test/Mono.Cecil.Tests/PortablePdbTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,11 +885,13 @@ public void ReadPortablePdbChecksum ()
using (var module = GetResourceModule (resource, new ReaderParameters { ReadSymbols = true })) {
GetPdbChecksumData (module.GetDebugHeader (), out string algorithmName, out byte [] checksum);
Assert.AreEqual ("SHA256", algorithmName);
GetCodeViewPdbId (module, out byte[] pdbId);

string pdbPath = GetDebugHeaderPdbPath (module);
CalculatePdbChecksumAndId (pdbPath, out byte [] expectedChecksum, out byte [] pdbId);
string pdbPath = Mixin.GetPdbFileName (module.FileName);
CalculatePdbChecksumAndId (pdbPath, out byte [] expectedChecksum, out byte [] expectedPdbId);

CollectionAssert.AreEqual (expectedChecksum, checksum);
CollectionAssert.AreEqual (expectedPdbId, pdbId);
}
}

Expand All @@ -902,11 +904,13 @@ public void ReadEmbeddedPortablePdbChecksum ()
var debugHeader = module.GetDebugHeader ();
GetPdbChecksumData (debugHeader, out string algorithmName, out byte [] checksum);
Assert.AreEqual ("SHA256", algorithmName);
GetCodeViewPdbId (module, out byte [] pdbId);

GetEmbeddedPdb (debugHeader, out byte [] embeddedPdb);
CalculatePdbChecksumAndId (embeddedPdb, out byte [] expectedChecksum, out byte [] pdbId);
CalculatePdbChecksumAndId (embeddedPdb, out byte [] expectedChecksum, out byte [] expectedPdbId);

CollectionAssert.AreEqual (expectedChecksum, checksum);
CollectionAssert.AreEqual (expectedPdbId, pdbId);
}
}

Expand All @@ -923,11 +927,13 @@ public void WritePortablePdbChecksum ()
using (var module = ModuleDefinition.ReadModule (destination, new ReaderParameters { ReadSymbols = true })) {
GetPdbChecksumData (module.GetDebugHeader (), out string algorithmName, out byte [] checksum);
Assert.AreEqual ("SHA256", algorithmName);
GetCodeViewPdbId (module, out byte [] pdbId);

string pdbPath = GetDebugHeaderPdbPath (module);
CalculatePdbChecksumAndId (pdbPath, out byte [] expectedChecksum, out byte [] pdbId);
string pdbPath = Mixin.GetPdbFileName (module.FileName);
CalculatePdbChecksumAndId (pdbPath, out byte [] expectedChecksum, out byte [] expectedPdbId);

CollectionAssert.AreEqual (expectedChecksum, checksum);
CollectionAssert.AreEqual (expectedPdbId, pdbId);
}
}

Expand Down Expand Up @@ -961,7 +967,7 @@ public void DoubleWritePortablePdbDeterministicPdbId ()

byte [] pdbIdOne;
using (var module = ModuleDefinition.ReadModule (destination, new ReaderParameters { ReadSymbols = true })) {
string pdbPath = GetDebugHeaderPdbPath (module);
string pdbPath = Mixin.GetPdbFileName (module.FileName);
CalculatePdbChecksumAndId (pdbPath, out byte [] expectedChecksum, out pdbIdOne);
}

Expand All @@ -971,7 +977,7 @@ public void DoubleWritePortablePdbDeterministicPdbId ()

byte [] pdbIdTwo;
using (var module = ModuleDefinition.ReadModule (destination, new ReaderParameters { ReadSymbols = true })) {
string pdbPath = GetDebugHeaderPdbPath (module);
string pdbPath = Mixin.GetPdbFileName (module.FileName);
CalculatePdbChecksumAndId (pdbPath, out byte [] expectedChecksum, out pdbIdTwo);
}

Expand All @@ -992,11 +998,13 @@ public void WriteEmbeddedPortablePdbChecksum ()
var debugHeader = module.GetDebugHeader ();
GetPdbChecksumData (debugHeader, out string algorithmName, out byte [] checksum);
Assert.AreEqual ("SHA256", algorithmName);
GetCodeViewPdbId (module, out byte [] pdbId);

GetEmbeddedPdb (debugHeader, out byte [] embeddedPdb);
CalculatePdbChecksumAndId (embeddedPdb, out byte [] expectedChecksum, out byte [] pdbId);
CalculatePdbChecksumAndId (embeddedPdb, out byte [] expectedChecksum, out byte [] expectedPdbId);

CollectionAssert.AreEqual (expectedChecksum, checksum);
CollectionAssert.AreEqual (expectedPdbId, pdbId);
}
}

Expand Down Expand Up @@ -1102,5 +1110,19 @@ private void CalculatePdbChecksumAndId (Stream pdbStream, out byte [] pdbChecksu
var sha256 = SHA256.Create ();
pdbChecksum = sha256.ComputeHash (bytes);
}

static void GetCodeViewPdbId (ModuleDefinition module, out byte[] pdbId)
{
var header = module.GetDebugHeader ();
var cv = Mixin.GetCodeViewEntry (header);
Assert.IsNotNull (cv);

CollectionAssert.AreEqual (new byte [] { 0x52, 0x53, 0x44, 0x53 }, cv.Data.Take (4));

ByteBuffer buffer = new ByteBuffer (20);
buffer.WriteBytes (cv.Data.Skip (4).Take (16).ToArray ());
buffer.WriteInt32 (cv.Directory.TimeDateStamp);
pdbId = buffer.buffer;
}
}
}