Improve error reporting for TGAs with invalid palettes

microsoft · Jan 8, 2025 · 6d8ed3d · 6d8ed3d
1 parent 9b4cf59
commit 6d8ed3d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/DirectXTex/DirectXTexTGA.cpp b/DirectXTex/DirectXTexTGA.cpp
@@ -1679,7 +1679,7 @@ HRESULT DirectX::LoadFromTGAMemory(
 
     const size_t remaining = size - offset - paletteOffset;
     if (remaining == 0)
-        return E_FAIL;
+        return HRESULT_E_HANDLE_EOF;
 
     const void* pPixels = static_cast<const uint8_t*>(pSource) + offset + paletteOffset;
 
@@ -2127,6 +2127,12 @@ HRESULT DirectX::LoadFromTGAFile(
                 image.Release();
                 return hr;
             }
+
+            if ((remaining - paletteOffset) == 0)
+            {
+                image.Release();
+                return HRESULT_E_HANDLE_EOF;
+            }
         }
 
         if (convFlags & CONV_FLAGS_RLE)