monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into confuser

Browse Source
This commit is contained in:
de4dot 2012-07-30 10:27:06 +02:00
commit 498316d2a2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
blocks/DotNetUtils.cs
View File

@ -596,7 +596,8 @@ namespace de4dot.blocks {
return null; return null;
var resources = module.Resources; var resources = module.Resources;
foreach (var resourceName in strings) { foreach (var tmp in strings) {
var resourceName = removeFromNullChar(tmp);
if (resourceName == null) if (resourceName == null)
continue; continue;
foreach (var resource in resources) { foreach (var resource in resources) {
@ -608,6 +609,13 @@ namespace de4dot.blocks {
return null; return null;
} }
static string removeFromNullChar(string s) {
int index = s.IndexOf((char)0);
if (index < 0)
return s;
return s.Substring(0, index);
}
// Copies most things but not everything // Copies most things but not everything
public static MethodDefinition clone(MethodDefinition method) { public static MethodDefinition clone(MethodDefinition method) {
var newMethod = new MethodDefinition(method.Name, method.Attributes, method.MethodReturnType.ReturnType); var newMethod = new MethodDefinition(method.Name, method.Attributes, method.MethodReturnType.ReturnType);

2
de4dot.code/MethodReturnValueInliner.cs
View File

@ -177,7 +177,7 @@ namespace de4dot.code {
public abstract bool HasHandlers { get; } public abstract bool HasHandlers { get; }
protected MethodDefinition Method { public MethodDefinition Method {
get { return theMethod; } get { return theMethod; }
} }