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

DiscIO: make sure to initialize out args to ReadSwapped

Browse source 
Fixes warnings:

```
../Source/Core/DiscIO/VolumeGC.cpp: In member function 'virtual u8 DiscIO::CVolumeGC::GetDiscNumber() const':
../Source/Core/DiscIO/VolumeGC.cpp:178:10: error: 'disc_number' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   return disc_number;
          ^
../Source/Core/DiscIO/VolumeWiiCrypted.cpp: In member function 'virtual u8 DiscIO::CVolumeWiiCrypted::GetDiscNumber() const':
../Source/Core/DiscIO/VolumeWiiCrypted.cpp:258:10: error: 'disc_number' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   return disc_number;
          ^
../Source/Core/DiscIO/VolumeWiiCrypted.cpp: In member function 'virtual IOS::ES::TMDReader DiscIO::CVolumeWiiCrypted::GetTMD() const':
../Source/Core/DiscIO/VolumeWiiCrypted.cpp:123:20: error: 'tmd_address' may be used uninitialized in this function [-Werror=maybe-uninitialized]
   tmd_address <<= 2;
                    ^
```
This commit is contained in:
Michael Maltese 2017-03-24 16:32:45 -07:00
parent c5cc781205
commit 4cd9a2ef1e
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/DiscIO/VolumeGC.cpp
View file

@ -173,7 +173,7 @@ u64 CVolumeGC::GetRawSize() const
u8 CVolumeGC::GetDiscNumber() const
{
u8 disc_number;
u8 disc_number = 0;
ReadSwapped(6, &disc_number, false);
return disc_number;
}

15
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View file

@ -115,11 +115,13 @@ IOS::ES::TicketReader CVolumeWiiCrypted::GetTicket() const
IOS::ES::TMDReader CVolumeWiiCrypted::GetTMD() const
{
u32 tmd_size;
u32 tmd_address;
u32 tmd_size = 0;
u32 tmd_address = 0;
ReadSwapped(m_VolumeOffset + 0x2a4, &tmd_size, false);
ReadSwapped(m_VolumeOffset + 0x2a8, &tmd_address, false);
if (!ReadSwapped(m_VolumeOffset + 0x2a4, &tmd_size, false))
return {};
if (!ReadSwapped(m_VolumeOffset + 0x2a8, &tmd_address, false))
return {};
tmd_address <<= 2;
if (tmd_size > 1024 * 1024 * 4)
@ -133,7 +135,8 @@ IOS::ES::TMDReader CVolumeWiiCrypted::GetTMD() const
}
std::vector<u8> buffer(tmd_size);
Read(m_VolumeOffset + tmd_address, tmd_size, buffer.data(), false);
if (!Read(m_VolumeOffset + tmd_address, tmd_size, buffer.data(), false))
return {};
return IOS::ES::TMDReader{std::move(buffer)};
}
@ -253,7 +256,7 @@ Platform CVolumeWiiCrypted::GetVolumeType() const
u8 CVolumeWiiCrypted::GetDiscNumber() const
{
u8 disc_number;
u8 disc_number = 0;
ReadSwapped(6, &disc_number, true);
return disc_number;
}