archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9270 from leoetlino/dtm-gameid-null

Browse source 
Core/Movie: Fix a likely out-of-bounds read for PanicAlertT
This commit is contained in:
LC 2020-11-21 01:53:15 -05:00 committed by GitHub
commit 41b79a66c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Core/Movie.cpp
View file

@ -227,10 +227,10 @@ void Init(const BootParameters& boot)
ReadHeader();
std::thread md5thread(CheckMD5);
md5thread.detach();
if (strncmp(tmpHeader.gameID.data(), SConfig::GetInstance().GetGameID().c_str(), 6))
if (tmpHeader.GetGameID() == SConfig::GetInstance().GetGameID())
{
PanicAlertFmtT("The recorded game ({0}) is not the same as the selected game ({1})",
tmpHeader.gameID.data(), SConfig::GetInstance().GetGameID());
tmpHeader.GetGameID(), SConfig::GetInstance().GetGameID());
EndPlayInput(false);
}
}

3
Source/Core/Core/Movie.h
View file

@ -8,6 +8,7 @@
#include <functional>
#include <optional>
#include <string>
#include <string_view>
#include "Common/CommonTypes.h"
@ -63,6 +64,8 @@ static_assert(sizeof(ControllerState) == 8, "ControllerState should be 8 bytes")
#pragma pack(push, 1)
struct DTMHeader
{
std::string_view GetGameID() const { return {gameID.data(), gameID.size()}; }
std::array<u8, 4> filetype; // Unique Identifier (always "DTM"0x1A)
std::array<char, 6> gameID; // The Game ID