Fix issue #49

Sicos1977 · Nov 21, 2022 · fde7bb0 · fde7bb0
1 parent c749482
commit fde7bb0
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 16 deletions.
diff --git a/.vs/IFilterTextReader/DesignTimeBuild/.dtbcache.v2 b/.vs/IFilterTextReader/DesignTimeBuild/.dtbcache.v2
diff --git a/.vs/IFilterTextReader/FileContentIndex/730c4ef7-2d25-4d43-a166-bdbaf7de162c.vsidx b/.vs/IFilterTextReader/FileContentIndex/730c4ef7-2d25-4d43-a166-bdbaf7de162c.vsidx
diff --git a/.vs/IFilterTextReader/FileContentIndex/read.lock b/.vs/IFilterTextReader/FileContentIndex/read.lock
diff --git a/.vs/IFilterTextReader/v17/.futdcache.v2 b/.vs/IFilterTextReader/v17/.futdcache.v2
diff --git a/.vs/ProjectEvaluation/ifiltertextreader.metadata.v5.2 b/.vs/ProjectEvaluation/ifiltertextreader.metadata.v5.2
diff --git a/.vs/ProjectEvaluation/ifiltertextreader.projects.v5.2 b/.vs/ProjectEvaluation/ifiltertextreader.projects.v5.2
diff --git a/IFilterTextReader/FilterLoader.cs b/IFilterTextReader/FilterLoader.cs
@@ -189,28 +189,25 @@ public static NativeMethods.IFilter LoadAndInitIFilter(Stream stream,
             if (string.IsNullOrWhiteSpace(fileName))
                 throw new IFOldFilterFormat("The IFilter does not support the IPersistStream interface, supply a filename to use the IFilter");
 
-            try
+            // If we get here we probably are using an old IFilter so try to load it the old way
+            // ReSharper disable once SuspiciousTypeConversion.Global
+            if (iFilter is IPersistFile persistFile)
             {
-                // If we get here we probably are using an old IFilter so try to load it the old way
-                // ReSharper disable once SuspiciousTypeConversion.Global
-                if (iFilter is IPersistFile persistFile)
+                try
                 {
                     persistFile.Load(fileName, 0);
-                    if (iFilter.Init(iFlags, 0, IntPtr.Zero, out _) == NativeMethods.IFilterReturnCode.S_OK)
-                        return iFilter;
                 }
-            }
-            catch (Exception)
-            {
-                throw new IFUnknownFormat($"The file '{fileName}' has an unknown format");
-            }
-            finally
-            {
-                // If we failed to retrieve an IPersistStream or IPersistFile interface or to initialize
-                // the filter, we release it and return null.
-                Marshal.ReleaseComObject(iFilter);
+                catch (Exception)
+                {
+                    Marshal.ReleaseComObject(iFilter);
+                    throw new IFUnknownFormat($"The file '{fileName}' has an unknown format");
+                }
+
+                if (iFilter.Init(iFlags, 0, IntPtr.Zero, out _) == NativeMethods.IFilterReturnCode.S_OK)
+                    return iFilter;
             }
 
+            Marshal.ReleaseComObject(iFilter);
             return null;
         }
         #endregion