lifegpc/GARbro
1
0
Fork 0
mirror of https://github.com/lifegpc/GARbro.git synced 2026-06-06 05:28:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

(TifFormat): precaution against ill-formed files.

Browse Source
This commit is contained in:
morkt
2016-12-17 06:08:02 +04:00
parent 82bfbd7398
commit 428214182d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
GameRes/ImageTIFF.cs
View File

@@ -2,7 +2,7 @@
//! \date Mon Jul 07 06:39:45 2014 //! \date Mon Jul 07 06:39:45 2014
//! \brief TIFF image implementation. //! \brief TIFF image implementation.
// //
// Copyright (C) 2014 by morkt // Copyright (C) 2014-2016 by morkt
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
@@ -29,6 +29,7 @@ using System.Text;
using System.ComponentModel.Composition; using System.ComponentModel.Composition;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using GameRes.Utility; using GameRes.Utility;
using System.Collections.Generic;
namespace GameRes namespace GameRes
{ {
@@ -165,10 +166,12 @@ namespace GameRes
{ {
MetaParsed parsed = MetaParsed.None; MetaParsed parsed = MetaParsed.None;
int width = 0, height = 0, bpp = 0, pos_x = 0, pos_y = 0; int width = 0, height = 0, bpp = 0, pos_x = 0, pos_y = 0;
var seen_ifd = new HashSet<uint>();
uint ifd = m_first_ifd; uint ifd = m_first_ifd;
while (ifd != 0 && parsed != MetaParsed.Complete) while (ifd != 0 && parsed != MetaParsed.Complete && !seen_ifd.Contains (ifd))
{ {
m_file.Position = ifd; m_file.Position = ifd;
seen_ifd.Add (ifd);
uint tag_count = ReadUInt16(); uint tag_count = ReadUInt16();
ifd += 2; ifd += 2;
for (uint i = 0; i < tag_count && parsed != MetaParsed.Complete; ++i) for (uint i = 0; i < tag_count && parsed != MetaParsed.Complete; ++i)
@@ -222,10 +225,7 @@ namespace GameRes
ifd += 12; ifd += 12;
m_file.Position = ifd; m_file.Position = ifd;
} }
uint ifd_next = ReadUInt32(); ifd = ReadUInt32();
if (ifd_next == ifd)
break;
ifd = ifd_next;
} }
if (MetaParsed.Sufficient == (parsed & MetaParsed.Sufficient)) if (MetaParsed.Sufficient == (parsed & MetaParsed.Sufficient))
return new ImageMetaData() { return new ImageMetaData() {
@@ -327,7 +327,7 @@ namespace GameRes
value = 0; value = 0;
return false; return false;
} }
if (m_is_bigendian) if (m_is_bigendian ^ !BitConverter.IsLittleEndian)
Array.Reverse (convert_buffer); Array.Reverse (convert_buffer);
value = (int)BitConverter.ToSingle (convert_buffer, 0); value = (int)BitConverter.ToSingle (convert_buffer, 0);
return true; return true;
@@ -341,7 +341,7 @@ namespace GameRes
value = 0; value = 0;
return false; return false;
} }
if (m_is_bigendian) if (m_is_bigendian ^ !BitConverter.IsLittleEndian)
Array.Reverse (convert_buffer); Array.Reverse (convert_buffer);
long bits = BitConverter.ToInt64 (convert_buffer, 0); long bits = BitConverter.ToInt64 (convert_buffer, 0);
value = (int)BitConverter.Int64BitsToDouble (bits); value = (int)BitConverter.Int64BitsToDouble (bits);