Skip to content

Fix potential secret value crash in font string width checks #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Amadeus- wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix potential secret value crash in font string width checks #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion GUI_Detail.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,14 +476,18 @@ function Recount:WrapFontString(fontstring, maxwidth)
local Returning = ""
local Temp, NextWhite

while fontstring:GetStringWidth() > maxwidth do
local ok, sw = pcall(fontstring.GetStringWidth, fontstring)
while ok and type(sw) == "number" and not (issecretvalue and issecretvalue(sw)) and sw > maxwidth do
Temp = string.reverse(Text)
local _
_, NextWhite = string.find(Temp,"( +)")

if not NextWhite then break end

Returning = string.sub(Text, string.len(Text) - NextWhite + 1, string.len(Text))..Returning
Text = string.sub(Text, 1, string.len(Text) - NextWhite)
fontstring:SetText(Text)
ok, sw = pcall(fontstring.GetStringWidth, fontstring)
end
return Returning
end
Expand Down
4 changes: 3 additions & 1 deletion GUI_Graph.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,9 +746,11 @@ end
function Recount:CheckFontStringLength(fontstring, maxwidth)
local Text = fontstring:GetText()

while fontstring:GetStringWidth() > maxwidth do
local ok, sw = pcall(fontstring.GetStringWidth, fontstring)
while ok and type(sw) == "number" and not (issecretvalue and issecretvalue(sw)) and sw > maxwidth do
Text = string.sub(Text, 1, string.len(Text) - 1)
fontstring:SetText(Text.."...")
ok, sw = pcall(fontstring.GetStringWidth, fontstring)
end
end

Expand Down