幅or高さがImageの上限(16384px)より大きいGIFファイルを読むとアクセス違反が起きるのを修正 (#1171)

Siv3D · Dec 27, 2023 · 6c63dfb · 6c63dfb
1 parent d6bff59
commit 6c63dfb
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Siv3D/src/Siv3D/ImageFormat/GIF/GIFDecoder.cpp b/Siv3D/src/Siv3D/ImageFormat/GIF/GIFDecoder.cpp
@@ -159,10 +159,19 @@ namespace s3d
 
 		if ((width == 0) || (height == 0))
 		{
+			DGifCloseFile(gif, &error);
+
 			return{};
 		}
 
 		Image image{ width, height };
+		if (!image)
+		{
+			DGifCloseFile(gif, &error);
+
+			return{};
+		}
+
 		Color* pDst = image.data();
 
 		for (size_t y = 0; y < height; ++y)