dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-08 08:33:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check whether WAD is a channel before reading names

Browse Source 
Dolphin assumes that content 0 is opening.bnr, without checking
whether content 0 exists or if it is even supposed to be there (it's
only there for channels). This results in sometimes reading garbage.

This adds a check to only try to read names from content 0's header
if the title is a channel (channel, system channel or game channel).
This commit is contained in:
Léo Lam 2017-03-18 15:01:03 +01:00
parent b83929477f
commit c987f58319
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/IOS/ES/Formats.cpp
View File

@ -33,6 +33,13 @@ bool IsDiscTitle(u64 title_id)
IsTitleType(title_id, TitleType::GameWithChannel); IsTitleType(title_id, TitleType::GameWithChannel);
} }
bool IsChannel(u64 title_id)
{
return IsTitleType(title_id, TitleType::Channel) ||
IsTitleType(title_id, TitleType::SystemChannel) ||
IsTitleType(title_id, TitleType::GameWithChannel);
}
bool Content::IsShared() const bool Content::IsShared() const
{ {
return (type & 0x8000) != 0; return (type & 0x8000) != 0;

1
Source/Core/Core/IOS/ES/Formats.h
View File

@ -31,6 +31,7 @@ enum class TitleType : u32
bool IsTitleType(u64 title_id, TitleType title_type); bool IsTitleType(u64 title_id, TitleType title_type);
bool IsDiscTitle(u64 title_id); bool IsDiscTitle(u64 title_id);
bool IsChannel(u64 title_id);
#pragma pack(push, 4) #pragma pack(push, 4)
struct TMDHeader struct TMDHeader

3
Source/Core/DiscIO/VolumeWad.cpp
View File

@ -130,6 +130,9 @@ Platform CVolumeWAD::GetVolumeType() const
std::map<Language, std::string> CVolumeWAD::GetLongNames() const std::map<Language, std::string> CVolumeWAD::GetLongNames() const
{ {
if (!m_tmd.IsValid() || !IOS::ES::IsChannel(m_tmd.GetTitleId()))
return {};
std::vector<u8> name_data(NAMES_TOTAL_BYTES); std::vector<u8> name_data(NAMES_TOTAL_BYTES);
if (!Read(m_opening_bnr_offset + 0x9C, NAMES_TOTAL_BYTES, name_data.data())) if (!Read(m_opening_bnr_offset + 0x9C, NAMES_TOTAL_BYTES, name_data.data()))
return std::map<Language, std::string>(); return std::map<Language, std::string>();

2
Source/Core/DolphinWX/ISOFile.cpp
View File

@ -36,7 +36,7 @@
#include "DolphinWX/ISOFile.h" #include "DolphinWX/ISOFile.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
static const u32 CACHE_REVISION = 0x128; // Last changed in PR 4542 static const u32 CACHE_REVISION = 0x129; // Last changed in PR 5102
static std::string GetLanguageString(DiscIO::Language language, static std::string GetLanguageString(DiscIO::Language language,
std::map<DiscIO::Language, std::string> strings) std::map<DiscIO::Language, std::string> strings)