AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 04:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Buffer access fixes

Browse Source
This commit is contained in:
Jack Andersen
2015-09-09 14:08:29 -10:00
parent 83252ea611
commit 23f89ee747
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DataSpec/DNACommon/CMDL.hpp
View File

@@ -188,10 +188,14 @@ class DLReader
{
case GX::DIRECT:
case GX::INDEX8:
if ((m_cur - m_dl.get()) >= intptr_t(m_dlSize))
return 0;
retval = *m_cur;
++m_cur;
break;
case GX::INDEX16:
if ((m_cur - m_dl.get() + 1) >= intptr_t(m_dlSize))
return 0;
retval = HECL::SBig(*(atUint16*)m_cur);
m_cur += 2;
break;
@@ -207,7 +211,7 @@ public:
}
operator bool()
{
return *m_cur && ((m_cur - m_dl.get()) < intptr_t(m_dlSize));
return ((m_cur - m_dl.get()) < intptr_t(m_dlSize)) && *m_cur;
}
GX::Primitive readPrimitive()
{
@@ -215,7 +219,9 @@ public:
}
atUint16 readVertCount()
{
return readVal(GX::INDEX16);
atUint16 retval = HECL::SBig(*(atUint16*)m_cur);
m_cur += 2;
return retval;
}
struct DLPrimVert
{