Fix file save, loading and tab bugs from a code review

.github/workflows/build-and-release.yml

@@ -48,7 +48,7 @@ jobs:
         uses: actions/upload-artifact@v7.0.2
         with:
           name: ${{ env.Asset_Name }}.zip
-          path: ./UOFiddler/bin/Release/
+          path: ./UoFiddler/bin/Release/
 
   release:
     name: Release

Ultima/AnimationEdit.cs

@@ -65,6 +65,13 @@ private static void InitializeCache()
         /// </summary>
         public static void Reload()
         {
+            _fileIndex?.Dispose();
+            _fileIndex2?.Dispose();
+            _fileIndex3?.Dispose();
+            _fileIndex4?.Dispose();
+            _fileIndex5?.Dispose();
+            _fileIndex6?.Dispose();
+
             _fileIndex = new FileIndex("Anim.idx", "Anim.mul", 6);
             _fileIndex2 = new FileIndex("Anim2.idx", "Anim2.mul", -1);
             _fileIndex3 = new FileIndex("Anim3.idx", "Anim3.mul", -1);
@@ -262,14 +269,19 @@ public static void LoadFromVD(int fileType, int body, BinaryReader bin)
                 entries[i].Extra = bin.ReadInt32();
             }
 
-            foreach (Entry3D entry in entries)
+            for (int i = 0; i < entries.Length; ++i, ++index)
             {
+                Entry3D entry = entries[i];
                 if ((entry.Lookup > 0) && (entry.Lookup < bin.BaseStream.Length) && (entry.Length > 0))
                 {
                     bin.BaseStream.Seek(entry.Lookup, SeekOrigin.Begin);
                     cache[index] = new AnimIdx(bin, entry.Extra);
                 }
-                ++index;
+                else
+                {
+                    // Empty in the .vd: drop what the body had there, as LoadActionFromVD does.
+                    GetAnimation(fileType, body, i / 5, i % 5).ClearFrames();
+                }
             }
         }
 
@@ -590,26 +602,31 @@ public unsafe Bitmap[] GetFrames()
 
                 var bmp = new Bitmap(width, height, PixelFormat.Format16bppArgb1555);
                 BitmapData bd = bmp.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format16bppArgb1555);
-                var line = (ushort*)bd.Scan0;
+                var pixels = (ushort*)bd.Scan0;
                 int delta = bd.Stride >> 1;
 
                 int xBase = frame.Center.X - 0x200;
                 int yBase = frame.Center.Y + height - 0x200;
 
-                line += xBase;
-                line += yBase * delta;
-
+                // Runs are clipped to the frame, so a bad header cannot write outside the bitmap.
                 for (int j = 0; j < frame.RawData.Length; ++j)
                 {
                     FrameEdit.Raw raw = frame.RawData[j];
 
-                    ushort* cur = line + (((raw.offsetY) * delta) + ((raw.offsetX) & 0x3FF));
-                    ushort* end = cur + (raw.run);
+                    int y = yBase + raw.offsetY;
+                    if (y < 0 || y >= height)
+                    {
+                        continue;
+                    }
 
-                    int ii = 0;
-                    while (cur < end)
+                    ushort* row = pixels + (y * delta);
+                    int x = xBase + (raw.offsetX & 0x3FF);
+                    for (int k = 0; k < raw.run; ++k, ++x)
                     {
-                        *cur++ = Palette[raw.data[ii++]];
+                        if (x >= 0 && x < width)
+                        {
+                            row[x] = Palette[raw.data[k]];
+                        }
                     }
                 }
 

Ultima/Animations.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
@@ -143,9 +144,15 @@ public static AnimationFrame[] GetAnimation(int body, int action, int direction,
                 _streamBuffer = new byte[length];
             }
 
-            _ = stream.Read(_streamBuffer, 0, length);
+            int read = stream.ReadAtLeast(_streamBuffer.AsSpan(0, length), length, throwOnEndOfStream: false);
 
-            var memoryStream = new MemoryStream(_streamBuffer, false);
+            // Too short to hold a palette and a frame count: decoding it would read stale buffer bytes.
+            if (read < (PaletteCapacity * 2) + 4)
+            {
+                return null;
+            }
+
+            var memoryStream = new MemoryStream(_streamBuffer, 0, read, false);
 
             bool flip = direction > 4;
             AnimationFrame[] frames;
@@ -711,54 +718,46 @@ public unsafe AnimationFrame(ushort[] palette, BinaryReader bin, bool flip)
             var bmp = new Bitmap(width, height, PixelFormat.Format16bppArgb1555);
             BitmapData bd = bmp.LockBits(
                 new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format16bppArgb1555);
-            var line = (ushort*)bd.Scan0;
+            var pixels = (ushort*)bd.Scan0;
             int delta = bd.Stride >> 1;
 
-            int header;
-
             int xBase = xCenter - 0x200;
             int yBase = (yCenter + height) - 0x200;
 
-            if (!flip)
+            try
             {
-                line += xBase;
-                line += yBase * delta;
-
+                int header;
                 while ((header = bin.ReadInt32()) != 0x7FFF7FFF)
                 {
                     header ^= _doubleXor;
 
-                    ushort* cur = line + ((((header >> 12) & 0x3FF) * delta) + ((header >> 22) & 0x3FF));
-                    ushort* end = cur + (header & 0xFFF);
-                    while (cur < end)
+                    // Runs are clipped to the frame, so a bad header cannot write outside the bitmap.
+                    int y = yBase + ((header >> 12) & 0x3FF);
+                    int x = xBase + ((header >> 22) & 0x3FF);
+                    int run = header & 0xFFF;
+                    bool rowInside = y >= 0 && y < height;
+                    ushort* row = pixels + (y * delta);
+
+                    for (int k = 0; k < run; ++k, ++x)
                     {
-                        *cur++ = palette[bin.ReadByte()];
+                        ushort color = palette[bin.ReadByte()];
+                        if (rowInside && x >= 0 && x < width)
+                        {
+                            row[flip ? width - 1 - x : x] = color;
+                        }
                     }
                 }
             }
-            else
+            finally
             {
-                line -= xBase - width + 1;
-                line += yBase * delta;
-
-                while ((header = bin.ReadInt32()) != 0x7FFF7FFF)
-                {
-                    header ^= _doubleXor;
-
-                    ushort* cur = line + ((((header >> 12) & 0x3FF) * delta) - ((header >> 22) & 0x3FF));
-                    ushort* end = cur - (header & 0xFFF);
-
-                    while (cur > end)
-                    {
-                        *cur-- = palette[bin.ReadByte()];
-                    }
-                }
+                bmp.UnlockBits(bd);
+            }
 
+            if (flip)
+            {
                 xCenter = width - xCenter;
             }
 
-            bmp.UnlockBits(bd);
-
             Center = new Point(xCenter, yCenter);
             Bitmap = bmp;
         }