Author: jbevain
Date: 2007-12-20 19:18:49 -0500 (Thu, 20 Dec 2007)
New Revision: 91745

Modified:
   trunk/mcs/class/Mono.Cecil/ChangeLog
   trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs
   trunk/mcs/class/Mono.Cecil/Mono.Cecil/AggressiveReflectionReader.cs
   trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionReader.cs
Log:
2007-12-21  Jb Evain  <[EMAIL PROTECTED]>

        * Mono.Cecil/ReflectionReader.cs
          Mono.Cecil/AggressiveReflectionReader.cs
          Mono.Cecil.Signatures/SignatureReader.cs:
                Don't crash on force resolve for nested arrays
                in custom attributes.


Modified: trunk/mcs/class/Mono.Cecil/ChangeLog
===================================================================
--- trunk/mcs/class/Mono.Cecil/ChangeLog        2007-12-21 00:15:55 UTC (rev 
91744)
+++ trunk/mcs/class/Mono.Cecil/ChangeLog        2007-12-21 00:18:49 UTC (rev 
91745)
@@ -1,3 +1,11 @@
+2007-12-21  Jb Evain  <[EMAIL PROTECTED]>
+
+       * Mono.Cecil/ReflectionReader.cs
+         Mono.Cecil/AggressiveReflectionReader.cs
+         Mono.Cecil.Signatures/SignatureReader.cs:
+               Don't crash on force resolve for nested arrays
+               in custom attributes.
+
 2007-12-17  Jb Evain  <[EMAIL PROTECTED]>
 
        * Mono.Cecil/IMemberDefinition.cs: make IMemberDefinition

Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil/AggressiveReflectionReader.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil/AggressiveReflectionReader.cs 
2007-12-21 00:15:55 UTC (rev 91744)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil/AggressiveReflectionReader.cs 
2007-12-21 00:18:49 UTC (rev 91745)
@@ -325,13 +325,7 @@
                                        ctor = GetMemberRefAt (caRow.Type.RID, 
new GenericContext ()) as MethodReference;
 
                                CustomAttrib ca = m_sigReader.GetCustomAttrib 
(caRow.Value, ctor);
-                               CustomAttribute cattr;
-                               if (!ca.Read) {
-                                       cattr = new CustomAttribute (ctor);
-                                       cattr.Resolved = false;
-                                       cattr.Blob = 
m_root.Streams.BlobHeap.Read (caRow.Value);
-                               } else
-                                       cattr = BuildCustomAttribute (ctor, ca);
+                               CustomAttribute cattr = BuildCustomAttribute 
(ctor, m_root.Streams.BlobHeap.Read (caRow.Value), ca);
 
                                if (caRow.Parent.RID == 0)
                                        continue;

Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionReader.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionReader.cs   2007-12-21 
00:15:55 UTC (rev 91744)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil/ReflectionReader.cs   2007-12-21 
00:18:49 UTC (rev 91745)
@@ -402,7 +402,7 @@
                public CustomAttribute GetCustomAttribute (MethodReference 
ctor, byte [] data, bool resolve)
                {
                        CustomAttrib sig = m_sigReader.GetCustomAttrib (data, 
ctor, resolve);
-                       return BuildCustomAttribute (ctor, sig);
+                       return BuildCustomAttribute (ctor, data, sig);
                }
 
                public CustomAttribute GetCustomAttribute (MethodReference 
ctor, byte [] data)
@@ -824,9 +824,14 @@
                        return GetFixedArgType (na.FixedArg);
                }
 
-               protected CustomAttribute BuildCustomAttribute (MethodReference 
ctor, CustomAttrib sig)
+               protected CustomAttribute BuildCustomAttribute (MethodReference 
ctor, byte [] data, CustomAttrib sig)
                {
                        CustomAttribute cattr = new CustomAttribute (ctor);
+                       if (!sig.Read) {
+                               cattr.Resolved = false;
+                               cattr.Blob = data;
+                               return cattr;
+                       }
 
                        foreach (CustomAttrib.FixedArg fa in sig.FixedArgs)
                                cattr.ConstructorParameters.Add 
(GetFixedArgValue (fa));

Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs 
2007-12-21 00:15:55 UTC (rev 91744)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs 
2007-12-21 00:18:49 UTC (rev 91745)
@@ -717,6 +717,7 @@
                {
                        switch (elemType) {
                        case ElementType.Boxed :
+                       case ElementType.Object:
                                return m_reflectReader.SearchCoreType 
(Constants.Object);
                        case ElementType.String :
                                return m_reflectReader.SearchCoreType 
(Constants.String);
@@ -785,7 +786,7 @@
                                        return elem;
                                } else if (elemType.FullName == 
Constants.Object)
                                        throw new MetadataFormatException ("Non 
valid type in CustomAttrib.Elem after boxed prefix: 0x{0}",
-                                               ((byte) 
elem.FieldOrPropType).ToString("x2"));
+                                               ((byte) 
elem.FieldOrPropType).ToString ("x2"));
 
                                elem = ReadElem (data, br, elemType, ref read, 
resolve);
                                elem.String = elem.Simple = elem.Type = false;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to