[ilasm] Even more undocumented custom attributes syntax

1 files changed, 17 insertions, 2 deletions

diff --git a/mcs/class/PEAPI/Metadata.cs b/mcs/class/PEAPI/Metadata.cs
index 5e33ca09a9b..d983c8a2a2c 100644
--- a/mcs/class/PEAPI/Metadata.cs
+++ b/mcs/class/PEAPI/Metadata.cs
@@ -458,6 +458,12 @@ namespace PEAPI {
 			ms.WriteByte (1);
 			ms.WriteByte (0);
 
+			if (c == null) {
+				ms.WriteByte (0);
+				ms.WriteByte (0);
+				return ms.ToArray ();
+			}
+
 			var sc = c as StringConst;
 			if (sc != null) {
 				string value = sc.val;
@@ -475,12 +481,21 @@ namespace PEAPI {
 			var ac = c as ArrayConstant;
 			if (ac != null) {
 				var bw = new BinaryWriter (ms);
-				bw.Write (ac.ExplicitSize.Value);
+				if (ac.ExplicitSize != null)
+					bw.Write (ac.ExplicitSize.Value);
 				ac.Write (bw);
 				bw.Write ((short)0);
 				return ms.ToArray ();
 			}
 
+			var bc = c as DataConstant;
+			if (bc != null) {
+				var bw = new BinaryWriter (ms);
+				bc.Write (bw);
+				bw.Write ((short)0);
+				return ms.ToArray ();
+			}
+
 			throw new NotImplementedException (c.GetType ().ToString ());
 		}
 
@@ -3149,7 +3164,7 @@ namespace PEAPI {
 
 	}
 
-	public class UIntConst : Constant {
+	public class UIntConst : DataConstant {
 		ulong val;
 
 		public UIntConst(byte val)