AxioDL
/
kabufuda
mirror of https://github.com/AxioDL/kabufuda.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from lioncash/game 

Card: Zero out game array within setCurrentGame for nullptr
This commit is contained in:
Phillip Stephens 2019-09-01 11:05:56 -07:00 committed by GitHub
parent a701828371 54f9a11012
commit 9484bf40f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/kabufuda/Card.cpp
View File

@ -691,38 +691,45 @@ bool Card::moveFileTo(FileHandle& fh, Card& dest)
void Card::setCurrentGame(const char* game) { void Card::setCurrentGame(const char* game) {
if (game == nullptr) { if (game == nullptr) {
memset(m_game, 0, 2); std::memset(m_game, 0, sizeof(m_game));
return; return;
} }
if (strlen(game) != 4) constexpr size_t copy_amount = sizeof(m_game) - 1;
if (std::strlen(game) != copy_amount) {
return; return;
}
memcpy(m_game, game, 4); std::memcpy(m_game, game, copy_amount);
} }
const uint8_t* Card::getCurrentGame() const { const uint8_t* Card::getCurrentGame() const {
if (strlen(m_game) == 4) if (std::strlen(m_game) == sizeof(m_game) - 1) {
return reinterpret_cast<const uint8_t*>(m_game); return reinterpret_cast<const uint8_t*>(m_game);
}
return nullptr; return nullptr;
} }
void Card::setCurrentMaker(const char* maker) { void Card::setCurrentMaker(const char* maker) {
if (maker == nullptr) { if (maker == nullptr) {
memset(m_maker, 0, 2); std::memset(m_maker, 0, sizeof(m_maker));
return; return;
} }
if (strlen(maker) != 2) constexpr size_t copy_amount = sizeof(m_maker) - 1;
if (std::strlen(maker) != copy_amount) {
return; return;
}
memcpy(m_maker, maker, 2); std::memcpy(m_maker, maker, copy_amount);
} }
const uint8_t* Card::getCurrentMaker() const { const uint8_t* Card::getCurrentMaker() const {
if (strlen(m_maker) == 2) if (std::strlen(m_maker) == sizeof(m_maker) - 1) {
return reinterpret_cast<const uint8_t*>(m_maker); return reinterpret_cast<const uint8_t*>(m_maker);
}
return nullptr; return nullptr;
} }