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

Merge pull request #5319 from leoetlino/ticket-view-version 

ESFormats: Fix the first field of ticket views
This commit is contained in:
Léo Lam 2017-04-26 11:24:13 +02:00 committed by GitHub
parent 255fd14db6 1b3b7518e6
commit 33f56a84b2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,17 +285,17 @@ const std::vector<u8>& TicketReader::GetRawTicket() const
std::vector<u8> TicketReader::GetRawTicketView(u32 ticket_num) const
{
// A ticket view is composed of a view ID + part of a ticket starting from the ticket_id field.
// A ticket view is composed of a version + part of a ticket starting from the ticket_id field.
const auto ticket_start = m_bytes.cbegin() + GetOffset() + sizeof(Ticket) * ticket_num;
const auto view_start = ticket_start + offsetof(Ticket, ticket_id);
// Copy the view ID to the buffer.
std::vector<u8> view(sizeof(TicketView::view));
const u32 view_id = Common::swap32(ticket_num);
std::memcpy(view.data(), &view_id, sizeof(view_id));
// Copy the ticket version to the buffer (a single byte extended to 4).
std::vector<u8> view(sizeof(TicketView::version));
const u32 version = Common::swap32(m_bytes.at(offsetof(Ticket, version)));
std::memcpy(view.data(), &version, sizeof(version));
// Copy the rest of the ticket view structure from the ticket.
view.insert(view.end(), view_start, view_start + (sizeof(TicketView) - sizeof(view_id)));
view.insert(view.end(), view_start, view_start + (sizeof(TicketView) - sizeof(version)));
_assert_(view.size() == sizeof(TicketView));
return view;

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

@ -82,7 +82,7 @@ struct TimeLimit
struct TicketView
{
u32 view;
u32 version;
u64 ticket_id;
u32 device_id;
u64 title_id;