ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Fix bounds checking within GCMemcard.cpp. 

Prior to this 127 would be an allowed numeric index. However There is only an addressable range from 0-126.
This commit is contained in:
Lioncash 2014-07-17 01:33:47 -04:00
parent 9481af886b
commit 7ca8a834c1
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Source/Core/Core/HW/GCMemcard.cpp
View File

@ -366,7 +366,7 @@ u8 GCMemcard::TitlePresent(DEntry d) const
bool GCMemcard::GCI_FileName(u8 index, std::string &filename) const bool GCMemcard::GCI_FileName(u8 index, std::string &filename) const
{ {
if (!m_valid || index > DIRLEN || (BE32(CurrentDir->Dir[index].Gamecode) == 0xFFFFFFFF)) if (!m_valid || index >= DIRLEN || (BE32(CurrentDir->Dir[index].Gamecode) == 0xFFFFFFFF))
return false; return false;
filename = CurrentDir->Dir[index].GCI_FileName(); filename = CurrentDir->Dir[index].GCI_FileName();
@ -378,7 +378,7 @@ bool GCMemcard::GCI_FileName(u8 index, std::string &filename) const
std::string GCMemcard::DEntry_GameCode(u8 index) const std::string GCMemcard::DEntry_GameCode(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
return std::string((const char*)CurrentDir->Dir[index].Gamecode, 4); return std::string((const char*)CurrentDir->Dir[index].Gamecode, 4);
@ -386,14 +386,15 @@ std::string GCMemcard::DEntry_GameCode(u8 index) const
std::string GCMemcard::DEntry_Makercode(u8 index) const std::string GCMemcard::DEntry_Makercode(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
return std::string((const char*)CurrentDir->Dir[index].Makercode, 2); return std::string((const char*)CurrentDir->Dir[index].Makercode, 2);
} }
std::string GCMemcard::DEntry_BIFlags(u8 index) const std::string GCMemcard::DEntry_BIFlags(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
std::string flags; std::string flags;
@ -408,7 +409,7 @@ std::string GCMemcard::DEntry_BIFlags(u8 index) const
std::string GCMemcard::DEntry_FileName(u8 index) const std::string GCMemcard::DEntry_FileName(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
return std::string((const char*)CurrentDir->Dir[index].Filename, DENTRY_STRLEN); return std::string((const char*)CurrentDir->Dir[index].Filename, DENTRY_STRLEN);
@ -416,7 +417,7 @@ std::string GCMemcard::DEntry_FileName(u8 index) const
u32 GCMemcard::DEntry_ModTime(u8 index) const u32 GCMemcard::DEntry_ModTime(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFFFFFFFF; return 0xFFFFFFFF;
return BE32(CurrentDir->Dir[index].ModTime); return BE32(CurrentDir->Dir[index].ModTime);
@ -424,7 +425,7 @@ u32 GCMemcard::DEntry_ModTime(u8 index) const
u32 GCMemcard::DEntry_ImageOffset(u8 index) const u32 GCMemcard::DEntry_ImageOffset(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFFFFFFFF; return 0xFFFFFFFF;
return BE32(CurrentDir->Dir[index].ImageOffset); return BE32(CurrentDir->Dir[index].ImageOffset);
@ -432,7 +433,7 @@ u32 GCMemcard::DEntry_ImageOffset(u8 index) const
std::string GCMemcard::DEntry_IconFmt(u8 index) const std::string GCMemcard::DEntry_IconFmt(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
int x = CurrentDir->Dir[index].IconFmt[0]; int x = CurrentDir->Dir[index].IconFmt[0];
@ -448,7 +449,7 @@ std::string GCMemcard::DEntry_IconFmt(u8 index) const
std::string GCMemcard::DEntry_AnimSpeed(u8 index) const std::string GCMemcard::DEntry_AnimSpeed(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
int x = CurrentDir->Dir[index].AnimSpeed[0]; int x = CurrentDir->Dir[index].AnimSpeed[0];
@ -464,7 +465,7 @@ std::string GCMemcard::DEntry_AnimSpeed(u8 index) const
std::string GCMemcard::DEntry_Permissions(u8 index) const std::string GCMemcard::DEntry_Permissions(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
u8 Permissions = CurrentDir->Dir[index].Permissions; u8 Permissions = CurrentDir->Dir[index].Permissions;
@ -477,7 +478,7 @@ std::string GCMemcard::DEntry_Permissions(u8 index) const
u8 GCMemcard::DEntry_CopyCounter(u8 index) const u8 GCMemcard::DEntry_CopyCounter(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFF; return 0xFF;
return CurrentDir->Dir[index].CopyCounter; return CurrentDir->Dir[index].CopyCounter;
@ -485,7 +486,7 @@ u8 GCMemcard::DEntry_CopyCounter(u8 index) const
u16 GCMemcard::DEntry_FirstBlock(u8 index) const u16 GCMemcard::DEntry_FirstBlock(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFFFF; return 0xFFFF;
u16 block = BE16(CurrentDir->Dir[index].FirstBlock); u16 block = BE16(CurrentDir->Dir[index].FirstBlock);
@ -495,7 +496,7 @@ u16 GCMemcard::DEntry_FirstBlock(u8 index) const
u16 GCMemcard::DEntry_BlockCount(u8 index) const u16 GCMemcard::DEntry_BlockCount(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFFFF; return 0xFFFF;
u16 blocks = BE16(CurrentDir->Dir[index].BlockCount); u16 blocks = BE16(CurrentDir->Dir[index].BlockCount);
@ -505,7 +506,7 @@ u16 GCMemcard::DEntry_BlockCount(u8 index) const
u32 GCMemcard::DEntry_CommentsAddress(u8 index) const u32 GCMemcard::DEntry_CommentsAddress(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFFFF; return 0xFFFF;
return BE32(CurrentDir->Dir[index].CommentsAddr); return BE32(CurrentDir->Dir[index].CommentsAddr);
@ -513,7 +514,7 @@ u32 GCMemcard::DEntry_CommentsAddress(u8 index) const
std::string GCMemcard::GetSaveComment1(u8 index) const std::string GCMemcard::GetSaveComment1(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
u32 Comment1 = BE32(CurrentDir->Dir[index].CommentsAddr); u32 Comment1 = BE32(CurrentDir->Dir[index].CommentsAddr);
@ -527,7 +528,7 @@ std::string GCMemcard::GetSaveComment1(u8 index) const
std::string GCMemcard::GetSaveComment2(u8 index) const std::string GCMemcard::GetSaveComment2(u8 index) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
u32 Comment1 = BE32(CurrentDir->Dir[index].CommentsAddr); u32 Comment1 = BE32(CurrentDir->Dir[index].CommentsAddr);
@ -542,7 +543,7 @@ std::string GCMemcard::GetSaveComment2(u8 index) const
bool GCMemcard::GetDEntry(u8 index, DEntry &dest) const bool GCMemcard::GetDEntry(u8 index, DEntry &dest) const
{ {
if (!m_valid || index > DIRLEN) if (!m_valid || index >= DIRLEN)
return false; return false;
dest = CurrentDir->Dir[index]; dest = CurrentDir->Dir[index];
@ -1028,7 +1029,7 @@ void GCMemcard::Gcs_SavConvert(DEntry &tempDEntry, int saveType, int length)
bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const
{ {
if (!m_valid) if (!m_valid || index >= DIRLEN)
return false; return false;
int flags = CurrentDir->Dir[index].BIFlags; int flags = CurrentDir->Dir[index].BIFlags;
@ -1069,7 +1070,7 @@ bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const
u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const
{ {
if (!m_valid) if (!m_valid || index >= DIRLEN)
return 0; return 0;
// To ensure only one type of icon is used // To ensure only one type of icon is used