Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-10-23 15:48:16 +08:00
Code Issues Projects Releases Wiki Activity

(NemesisDecodeContext): replaced asserts with exceptions.

Browse Source
This commit is contained in:
morkt 2016-09-27 23:41:40 +04:00
parent 95a0d8c9bf
commit 34209251c4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ArcFormats/Entis/ErisaNemesis.cs
View File

@ -123,7 +123,8 @@ namespace GameRes.Formats.Entis
{ {
break; break;
} }
Debug.Assert ((uint)pModel.SubModel[iLast].Symbol < pBase.dwWorkUsed); if ((uint)pModel.SubModel[iLast].Symbol >= pBase.dwWorkUsed)
throw new InvalidFormatException ("Invalid Nemesis encoding sequence");
pModel = pBase.ptrProbIndex[pModel.SubModel[iLast].Symbol]; pModel = pBase.ptrProbIndex[pModel.SubModel[iLast].Symbol];
} }
int iSym = DecodeERISACodeIndex (pModel); int iSym = DecodeERISACodeIndex (pModel);
@ -192,7 +193,8 @@ namespace GameRes.Formats.Entis
else else
{ {
m_nNemesisNext = (int)phrase.index[(phrase.first - nPhraseIndex) & Nemesis.IndexMask]; m_nNemesisNext = (int)phrase.index[(phrase.first - nPhraseIndex) & Nemesis.IndexMask];
Debug.Assert (m_pNemesisBuf[m_nNemesisNext] == bytLastSymbol); if (m_pNemesisBuf[m_nNemesisNext] != bytLastSymbol)
throw new InvalidFormatException ("Invalid Nemesis encoding sequence");
m_nNemesisNext = (m_nNemesisNext + 1) & Nemesis.BufMask; m_nNemesisNext = (m_nNemesisNext + 1) & Nemesis.BufMask;
} }
continue; continue;
@ -213,7 +215,8 @@ namespace GameRes.Formats.Entis
if ((pBase.dwWorkUsed < ErisaProbBase.SlotMax) && (iDeg < 4)) if ((pBase.dwWorkUsed < ErisaProbBase.SlotMax) && (iDeg < 4))
{ {
int iSymbol = ((byte)nSymbol) >> ErisaProbBase.m_nShiftCount[iDeg]; int iSymbol = ((byte)nSymbol) >> ErisaProbBase.m_nShiftCount[iDeg];
Debug.Assert (iSymbol < ErisaProbModel.SubSortMax); if (iSymbol >= ErisaProbModel.SubSortMax)
throw new InvalidFormatException ("Invalid Nemesis encoding sequence");
if (++pModel.SubModel[iSymbol].Occured >= ErisaProbBase.m_nNewProbLimit[iDeg]) if (++pModel.SubModel[iSymbol].Occured >= ErisaProbBase.m_nNewProbLimit[iDeg])
{ {
int i; int i;
@ -227,7 +230,8 @@ namespace GameRes.Formats.Entis
{ {
break; break;
} }
Debug.Assert ((uint)pModel.SubModel[iSymbol].Symbol < pBase.dwWorkUsed); if ((uint)pModel.SubModel[iSymbol].Symbol >= pBase.dwWorkUsed)
throw new InvalidFormatException ("Invalid Nemesis encoding sequence");
pModel = pBase.ptrProbIndex[pModel.SubModel[iSymbol].Symbol]; pModel = pBase.ptrProbIndex[pModel.SubModel[iSymbol].Symbol];
} }
if ((i <= iDeg) && (pModel.SubModel[iSymbol].Symbol < 0)) if ((i <= iDeg) && (pModel.SubModel[iSymbol].Symbol < 0))