Disposal checks

OpenMcdf/CfbStream.cs

@@ -136,7 +136,12 @@ public override void Write(byte[] buffer, int offset, int count)
 
 #if (!NETSTANDARD2_0 && !NETFRAMEWORK)
 
-    public override int Read(Span<byte> buffer) => stream.Read(buffer);
+    public override int Read(Span<byte> buffer)
+    {
+        this.ThrowIfDisposed(isDisposed);
+
+        return stream.Read(buffer);
+    }
 
     public override int ReadByte() => this.ReadByteCore();
 

OpenMcdf/DirectoryEntries.cs

@@ -17,6 +17,7 @@ public DirectoryEntries(RootContextSite rootContextSite)
 
     public void Dispose()
     {
+        directoryEntryEnumerator.Dispose();
         fatChainEnumerator.Dispose();
     }
 

OpenMcdf/DirectoryTree.cs

@@ -197,9 +197,9 @@ public void Remove(DirectoryEntry entry)
 
     public void WriteTrace(TextWriter writer)
     {
-        if (root is null)
+        if (root.ChildId == StreamId.NoStream)
         {
-            Trace.WriteLine("<empty tree>");
+            Trace.WriteLine("Empty tree");
             return;
         }
 

OpenMcdf/FatSectorEnumerator.cs

@@ -52,8 +52,6 @@ public bool MoveNext()
         return MoveTo(nextIndex);
     }
 
-    public bool IsAt(uint index) => !start && index == this.index;
-
     /// <summary>
     /// Moves the enumerator to the specified sector.
     /// </summary>
@@ -120,7 +118,6 @@ public void Reset()
     /// <returns>The ID of the new sector that was added</returns>
     public uint Add()
     {
-        // No FAT sectors are free, so add a new one
         Header header = Context.Header;
         uint nextIndex = Context.Header.FatSectorCount;
         Sector newFatSector = new(Context.SectorCount, Context.SectorSize);

OpenMcdf/MiniFatChainEnumerator.cs

@@ -25,6 +25,7 @@ public MiniFatChainEnumerator(RootContextSite rootContextSite, uint startSectorI
     /// <inheritdoc/>
     public void Dispose()
     {
+        miniFatEnumerator.Dispose();
     }
 
     /// <summary>

OpenMcdf/RootStorage.cs

@@ -118,7 +118,7 @@ void Consolidate()
             if (Context.BaseStream is MemoryStream)
                 destinationStream = new MemoryStream((int)Context.BaseStream.Length);
             else if (Context.BaseStream is FileStream)
-                destinationStream = File.Create(System.IO.Path.GetTempFileName());
+                destinationStream = File.Create(Path.GetTempFileName());
             else
                 throw new NotSupportedException("Unsupported stream type for consolidation.");
 

exclusion.dic

@@ -2,6 +2,7 @@ Blaseotto
 CFB
 CLSID
 codepage
+defragmentation
 depersist
 DIFAT
 endian