diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2021-07-26 22:40:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 22:40:39 +0300 |
| commit | 3bef7fc7b7910f826790ebfeccb381b76a650571 (patch) | |
| tree | d3e853251ce50b709b4a3130ad812a32d228837b /Mono.Cecil | |
| parent | a27b1fb8b08d412fbed56a053a5c0872ed9dba25 (diff) | |
| parent | 2f1077d7bb3527c3d821cb726a6d762abaea101a (diff) | |
Merge pull request #30 from jbevain/master
Bring in latest changes from upstream
Diffstat (limited to 'Mono.Cecil')
| -rw-r--r-- | Mono.Cecil/AssemblyReader.cs | 4 | ||||
| -rw-r--r-- | Mono.Cecil/ModuleDefinition.cs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Mono.Cecil/AssemblyReader.cs b/Mono.Cecil/AssemblyReader.cs index 9fdcf68..b66c162 100644 --- a/Mono.Cecil/AssemblyReader.cs +++ b/Mono.Cecil/AssemblyReader.cs @@ -3005,7 +3005,9 @@ namespace Mono.Cecil { object value; if (type.etype == ElementType.String) { - if (signature.buffer [signature.position] != 0xff) { + if (!signature.CanReadMore ()) + value = ""; + else if (signature.buffer [signature.position] != 0xff) { var bytes = signature.ReadBytes ((int) (signature.sig_length - (signature.position - signature.start))); value = Encoding.Unicode.GetString (bytes, 0, bytes.Length); } else diff --git a/Mono.Cecil/ModuleDefinition.cs b/Mono.Cecil/ModuleDefinition.cs index fce2777..84cd969 100644 --- a/Mono.Cecil/ModuleDefinition.cs +++ b/Mono.Cecil/ModuleDefinition.cs @@ -615,7 +615,7 @@ namespace Mono.Cecil { this.RuntimeVersion = image.RuntimeVersion; this.architecture = image.Architecture; this.attributes = image.Attributes; - this.characteristics = image.Characteristics; + this.characteristics = image.DllCharacteristics; this.linker_version = image.LinkerVersion; this.subsystem_major = image.SubSystemMajor; this.subsystem_minor = image.SubSystemMinor; |