v1.9.9: Fix FileStream_NET finalizer shenans

Author: FenPhoenix

AL_Common/IO/FileStream_NET.cs

@@ -23,6 +23,7 @@ public sealed class FileStream_NET : Stream
     private int _readPos;
     private int _readLen;
 
+#if false
     public FileStream_NET(AL_SafeFileHandle handle, FileAccess access, byte[] buffer, int bufferSize)
     {
         ValidateHandle(handle, access);
@@ -45,6 +46,7 @@ public FileStream_NET(AL_SafeFileHandle handle, FileAccess access, byte[] buffer
 
         _fileHandle = handle;
     }
+#endif
 
     public FileStream_NET(string path, FileMode mode, FileAccess access, FileShare share, byte[] buffer, int bufferSize)
         : this(path, mode, access, share, buffer, bufferSize, FileOptions.None)
@@ -56,13 +58,17 @@ public FileStream_NET(string path, FileMode mode, FileAccess access, FileShare s
     {
     }
 
+    // Disable because we don't need it and we don't want it running when we're in a weird state and _fileHandle
+    // could be null etc.
+#if false
     ~FileStream_NET()
     {
         // Preserved for compatibility since FileStream has defined a
         // finalizer in past releases and derived classes may depend
         // on Dispose(false) call.
         Dispose(false);
     }
+#endif
 
     private FileStream_NET(string path, FileMode mode, FileAccess access, FileShare share, byte[] buffer, int bufferSize, FileOptions options, long preallocationSize)
     {
@@ -75,10 +81,14 @@ private FileStream_NET(string path, FileMode mode, FileAccess access, FileShare
 
         _access = access;
 
-        _fileHandle = AL_SafeFileHandle.Open(fullPath, mode, access, share, options, preallocationSize);
-
         try
         {
+            /*
+            IMPORTANT: This MUST go inside the try block as it can throw!
+             The modern .NET version, through a complicated chain of logic, avoids this problem, but we don't.
+             The finalizer will run and _fileHandle will be null and then we crash the whole app.
+            */
+            _fileHandle = AL_SafeFileHandle.Open(fullPath, mode, access, share, options, preallocationSize);
             if (mode == FileMode.Append && CanSeek)
             {
                 _appendStart = _filePosition = GetLengthCore;
@@ -92,8 +102,12 @@ private FileStream_NET(string path, FileMode mode, FileAccess access, FileShare
         {
             // If anything goes wrong while setting up the stream, make sure we deterministically dispose
             // of the opened handle.
-            _fileHandle.Dispose();
-            _fileHandle = null!;
+            _fileHandle?.Dispose();
+            // If we want to enable the ctor that takes a file handle, we need to re-enable this and then re-do
+            // the logic to expect that this could null in the finalizer if we enable that too.
+#if false
+            _fileHandle = null;
+#endif
             throw;
         }
     }

AngelLoader/AngelLoader.csproj

@@ -23,9 +23,9 @@
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<Description>A standalone fan mission loader and manager for Thief Gold, Thief II, Thief: Deadly Shadows, System Shock 2, and The Dark Mod.</Description>
 		<Copyright>Copyright © 2018 - 2024</Copyright>
-		<Version>1.9.8</Version>
-		<AssemblyVersion>1.9.8</AssemblyVersion>
-		<FileVersion>1.9.8</FileVersion>
+		<Version>1.9.9</Version>
+		<AssemblyVersion>1.9.9</AssemblyVersion>
+		<FileVersion>1.9.9</FileVersion>
 		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 	</PropertyGroup>
 

Localizable_Strings_Changelog.md

@@ -6,6 +6,10 @@ If you want to update a translation from several versions back and don't want to
 
 ## List of localization-related changes by version
 
+### v1.9.9:
+
+No localizable text changes.
+
 ### v1.9.8:
 
 No localizable text changes.