lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(ArcView): check for disposed object access.

Browse Source
This commit is contained in:
morkt
2018-02-09 17:32:43 +04:00
parent 3212f08dec
commit ae042102ab
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
GameRes/ArcView.cs
View File

@@ -290,6 +290,8 @@ namespace GameRes
{ {
if (offset > m_arc.MaxOffset) if (offset > m_arc.MaxOffset)
throw new ArgumentOutOfRangeException ("offset", "Too large offset specified for memory mapped file view."); throw new ArgumentOutOfRangeException ("offset", "Too large offset specified for memory mapped file view.");
if (disposed)
throw new ObjectDisposedException (null);
if (size < ArcView.PageSize) if (size < ArcView.PageSize)
size = (uint)ArcView.PageSize; size = (uint)ArcView.PageSize;
if (size > m_arc.MaxOffset-offset) if (size > m_arc.MaxOffset-offset)
@@ -353,6 +355,8 @@ namespace GameRes
throw new ArgumentNullException ("buf", "Buffer cannot be null."); throw new ArgumentNullException ("buf", "Buffer cannot be null.");
if (buf_offset < 0) if (buf_offset < 0)
throw new ArgumentOutOfRangeException ("buf_offset", "Buffer offset should be non-negative."); throw new ArgumentOutOfRangeException ("buf_offset", "Buffer offset should be non-negative.");
if (disposed)
throw new ObjectDisposedException (null);
int total = (int)Math.Min (Reserve (offset, count), count); int total = (int)Math.Min (Reserve (offset, count), count);
if (buf.Length - buf_offset < total) if (buf.Length - buf_offset < total)
@@ -481,6 +485,7 @@ namespace GameRes
} }
m_arc = null; m_arc = null;
m_view = null; m_view = null;
m_size = 0;
disposed = true; disposed = true;
} }
} }
@@ -516,7 +521,7 @@ namespace GameRes
if (!_disposed) if (!_disposed)
return m_ptr; return m_ptr;
else else
throw new ObjectDisposedException ("Access to disposed ViewPointer object failed."); throw new ObjectDisposedException (null, "Access to disposed ViewPointer object failed.");
} }
} }