Author: jbevain
Date: 2006-03-20 11:52:22 -0500 (Mon, 20 Mar 2006)
New Revision: 58190

Modified:
   trunk/cecil/lib/ChangeLog
   trunk/cecil/lib/Mono.Cecil.Metadata/MetadataReader.cs
Log:
2006-03-20  Jb Evain  <[EMAIL PROTECTED]>

        * Mono.Cecil.Metadata/MetadataReader.cs:
                #Strings heap is utf8, fix #77820.


Modified: trunk/cecil/lib/ChangeLog
===================================================================
--- trunk/cecil/lib/ChangeLog   2006-03-20 16:01:06 UTC (rev 58189)
+++ trunk/cecil/lib/ChangeLog   2006-03-20 16:52:22 UTC (rev 58190)
@@ -1,3 +1,8 @@
+2006-03-20  Jb Evain  <[EMAIL PROTECTED]>
+
+       * Mono.Cecil.Metadata/MetadataReader.cs:
+               #Strings heap is utf8, fix #77820.
+
 2006-03-08  Jb Evain  <[EMAIL PROTECTED]>
 
        * CodeGen/cecil-gen-tests.rb

Modified: trunk/cecil/lib/Mono.Cecil.Metadata/MetadataReader.cs
===================================================================
--- trunk/cecil/lib/Mono.Cecil.Metadata/MetadataReader.cs       2006-03-20 
16:01:06 UTC (rev 58189)
+++ trunk/cecil/lib/Mono.Cecil.Metadata/MetadataReader.cs       2006-03-20 
16:52:22 UTC (rev 58190)
@@ -166,19 +166,20 @@
 
                        heap [(uint) 0] = string.Empty;
 
-                       BinaryReader br = new BinaryReader (new MemoryStream 
(heap.Data),
-                                                                               
                           Encoding.UTF8);
+                       BinaryReader br = new BinaryReader (
+                               new MemoryStream (heap.Data), Encoding.UTF8);
+
                        try {
 
                                br.BaseStream.Position++;
 
                                StringBuilder buffer = new StringBuilder ();
-                               for (int i = 1, index = 1 ; i < 
heap.Data.Length ; i++) {
+                               for (long index = br.BaseStream.Position ; 
br.BaseStream.Position < br.BaseStream.Length ; ) {
                                        char cur = br.ReadChar ();
                                        if (cur == '\0' && buffer.Length > 0) {
                                                heap [(uint) index] = 
buffer.ToString ();
                                                buffer = new StringBuilder ();
-                                               index = i + 1;
+                                               index = br.BaseStream.Position;
                                        } else
                                                buffer.Append (cur);
                                }

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

Reply via email to