phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-17 17:43:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: guard hexDecode std::stoul; extract duration formatting helpers

Browse source 
- Wrap std::stoul in auth_screen hexDecode() with try-catch to prevent
  crash on malformed saved password hex data
- Add fmtDurationCompact() helper replacing 3 identical duration format
  blocks (hours/minutes/seconds for aura icon overlays)
- Add renderAuraRemaining() helper replacing 5 identical "Remaining: Xm Ys"
  tooltip blocks across player/target/focus/raid aura tooltips
This commit is contained in:
Kelsi 2026-03-27 14:17:28 -07:00
parent 0ae7360255
commit 6783ead4ba
2 changed files with 31 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ui/auth_screen.cpp
View file

@ -44,8 +44,12 @@ static std::string hexEncode(const std::vector<uint8_t>& data) {
static std::vector<uint8_t> hexDecode(const std::string& hex) {
std::vector<uint8_t> bytes;
for (size_t i = 0; i + 1 < hex.size(); i += 2) {
uint8_t b = static_cast<uint8_t>(std::stoul(hex.substr(i, 2), nullptr, 16));
bytes.push_back(b);
try {
uint8_t b = static_cast<uint8_t>(std::stoul(hex.substr(i, 2), nullptr, 16));
bytes.push_back(b);
} catch (...) {
return {};
}
}
return bytes;
}

72
src/ui/game_screen.cpp
View file

@ -86,6 +86,23 @@ namespace {
return s.substr(first, last - first + 1);
}
// Format a duration in seconds as compact text: "2h", "3:05", "42"
void fmtDurationCompact(char* buf, size_t sz, int secs) {
if (secs >= 3600) snprintf(buf, sz, "%dh", secs / 3600);
else if (secs >= 60) snprintf(buf, sz, "%d:%02d", secs / 60, secs % 60);
else snprintf(buf, sz, "%d", secs);
}
// Render "Remaining: Xs" or "Remaining: Xm Ys" in a tooltip (light gray)
void renderAuraRemaining(int remainMs) {
if (remainMs <= 0) return;
int s = remainMs / 1000;
char buf[32];
if (s < 60) snprintf(buf, sizeof(buf), "Remaining: %ds", s);
else snprintf(buf, sizeof(buf), "Remaining: %dm %ds", s / 60, s % 60);
ImGui::TextColored(kLightGray, "%s", buf);
}
std::string toLower(std::string s) {
std::transform(s.begin(), s.end(), s.begin(), [](unsigned char c) {
return static_cast<char>(std::tolower(c));
@ -4810,13 +4827,7 @@ void GameScreen::renderTargetFrame(game::GameHandler& gameHandler) {
if (name.empty()) name = "Spell #" + std::to_string(aura.spellId);
ImGui::Text("%s", name.c_str());
}
if (tRemainMs > 0) {
int seconds = tRemainMs / 1000;
char durBuf[32];
if (seconds < 60) snprintf(durBuf, sizeof(durBuf), "Remaining: %ds", seconds);
else snprintf(durBuf, sizeof(durBuf), "Remaining: %dm %ds", seconds / 60, seconds % 60);
ImGui::TextColored(ui::colors::kLightGray, "%s", durBuf);
}
renderAuraRemaining(tRemainMs);
ImGui::EndTooltip();
}
@ -5021,10 +5032,7 @@ void GameScreen::renderTargetFrame(game::GameHandler& gameHandler) {
ImVec2 imin = ImGui::GetItemRectMin();
ImVec2 imax = ImGui::GetItemRectMax();
char ts[12];
int s = (taRemain + 999) / 1000;
if (s >= 3600) snprintf(ts, sizeof(ts), "%dh", s / 3600);
else if (s >= 60) snprintf(ts, sizeof(ts), "%d:%02d", s / 60, s % 60);
else snprintf(ts, sizeof(ts), "%d", s);
fmtDurationCompact(ts, sizeof(ts), (taRemain + 999) / 1000);
ImVec2 tsz = ImGui::CalcTextSize(ts);
float cx = imin.x + (imax.x - imin.x - tsz.x) * 0.5f;
float cy = imax.y - tsz.y;
@ -5042,13 +5050,7 @@ void GameScreen::renderTargetFrame(game::GameHandler& gameHandler) {
if (nm.empty()) nm = "Spell #" + std::to_string(aura.spellId);
ImGui::Text("%s", nm.c_str());
}
if (taRemain > 0) {
int s = taRemain / 1000;
char db[32];
if (s < 60) snprintf(db, sizeof(db), "Remaining: %ds", s);
else snprintf(db, sizeof(db), "Remaining: %dm %ds", s / 60, s % 60);
ImGui::TextColored(ui::colors::kLightGray, "%s", db);
}
renderAuraRemaining(taRemain);
ImGui::EndTooltip();
}
@ -5481,10 +5483,7 @@ void GameScreen::renderFocusFrame(game::GameHandler& gameHandler) {
ImVec2 imin = ImGui::GetItemRectMin();
ImVec2 imax = ImGui::GetItemRectMax();
char ts[12];
int s = (faRemain + 999) / 1000;
if (s >= 3600) snprintf(ts, sizeof(ts), "%dh", s / 3600);
else if (s >= 60) snprintf(ts, sizeof(ts), "%d:%02d", s / 60, s % 60);
else snprintf(ts, sizeof(ts), "%d", s);
fmtDurationCompact(ts, sizeof(ts), (faRemain + 999) / 1000);
ImVec2 tsz = ImGui::CalcTextSize(ts);
float cx = imin.x + (imax.x - imin.x - tsz.x) * 0.5f;
float cy = imax.y - tsz.y - 1.0f;
@ -5513,13 +5512,7 @@ void GameScreen::renderFocusFrame(game::GameHandler& gameHandler) {
if (nm.empty()) nm = "Spell #" + std::to_string(aura.spellId);
ImGui::Text("%s", nm.c_str());
}
if (faRemain > 0) {
int s = faRemain / 1000;
char db[32];
if (s < 60) snprintf(db, sizeof(db), "Remaining: %ds", s);
else snprintf(db, sizeof(db), "Remaining: %dm %ds", s / 60, s % 60);
ImGui::TextColored(ui::colors::kLightGray, "%s", db);
}
renderAuraRemaining(faRemain);
ImGui::EndTooltip();
}
@ -13439,10 +13432,7 @@ void GameScreen::renderBossFrames(game::GameHandler& gameHandler) {
ImVec2 imin = ImGui::GetItemRectMin();
ImVec2 imax = ImGui::GetItemRectMax();
char ts[12];
int s = (baRemain + 999) / 1000;
if (s >= 3600) snprintf(ts, sizeof(ts), "%dh", s / 3600);
else if (s >= 60) snprintf(ts, sizeof(ts), "%d:%02d", s / 60, s % 60);
else snprintf(ts, sizeof(ts), "%d", s);
fmtDurationCompact(ts, sizeof(ts), (baRemain + 999) / 1000);
ImVec2 tsz = ImGui::CalcTextSize(ts);
float cx = imin.x + (imax.x - imin.x - tsz.x) * 0.5f;
float cy = imax.y - tsz.y;
@ -13473,13 +13463,7 @@ void GameScreen::renderBossFrames(game::GameHandler& gameHandler) {
}
if (isPlayerCast && !isBuff)
ImGui::TextColored(ImVec4(0.9f, 0.7f, 0.3f, 1.0f), "Your DoT");
if (baRemain > 0) {
int s = baRemain / 1000;
char db[32];
if (s < 60) snprintf(db, sizeof(db), "Remaining: %ds", s);
else snprintf(db, sizeof(db), "Remaining: %dm %ds", s / 60, s % 60);
ImGui::TextColored(ui::colors::kLightGray, "%s", db);
}
renderAuraRemaining(baRemain);
ImGui::EndTooltip();
}
@ -15592,13 +15576,7 @@ void GameScreen::renderBuffBar(game::GameHandler& gameHandler) {
if (name.empty()) name = "Spell #" + std::to_string(aura.spellId);
ImGui::Text("%s", name.c_str());
}
if (remainMs > 0) {
int seconds = remainMs / 1000;
char durBuf[32];
if (seconds < 60) snprintf(durBuf, sizeof(durBuf), "Remaining: %ds", seconds);
else snprintf(durBuf, sizeof(durBuf), "Remaining: %dm %ds", seconds / 60, seconds % 60);
ImGui::TextColored(ui::colors::kLightGray, "%s", durBuf);
}
renderAuraRemaining(remainMs);
ImGui::EndTooltip();
}