Browse Source

Fix NullReferenceException when viewing assembly that targets .NET 1. Closes #65.

pull/70/head
Daniel Grunwald 15 years ago
parent
commit
3908426db0
  1. 20
      ICSharpCode.Decompiler/Ast/AstBuilder.cs

20
ICSharpCode.Decompiler/Ast/AstBuilder.cs

@ -939,23 +939,15 @@ namespace ICSharpCode.Decompiler.Ast @@ -939,23 +939,15 @@ namespace ICSharpCode.Decompiler.Ast
private static Expression ConvertArgumentValue(CustomAttributeArgument parameter)
{
var type = parameter.Type.Resolve();
Expression parameterValue;
if (type.IsEnum)
{
parameterValue = MakePrimitive(Convert.ToInt64(parameter.Value), type);
}
else if (parameter.Value is TypeReference)
{
parameterValue = new TypeOfExpression()
{
if (type != null && type.IsEnum) {
return MakePrimitive(Convert.ToInt64(parameter.Value), type);
} else if (parameter.Value is TypeReference) {
return new TypeOfExpression() {
Type = ConvertType((TypeReference)parameter.Value),
};
} else {
return new PrimitiveExpression(parameter.Value);
}
else
{
parameterValue = new PrimitiveExpression(parameter.Value);
}
return parameterValue;
}
#endregion

Loading…
Cancel
Save