Project

General

Profile

Defect #38728 ยป 0001-Correctly-escape-issue-text-in-Gantt-PNG-export-for-.patch

Holger Just, 2023-06-15 17:30

View differences:

lib/redmine/helpers/gantt.rb
gc.stroke('transparent')
gc.strokewidth(1)
gc.draw('text %d,%d %s' % [
left.round + 8, 14, Redmine::Utils::Shell.shell_quote("#{month_f.year}-#{month_f.month}")
left.round + 8, 14, magick_text("#{month_f.year}-#{month_f.month}")
])
left = left + width
month_f = month_f >> 1
......
gc.stroke('transparent')
gc.strokewidth(1)
gc.draw('text %d,%d %s' % [
left.round + 2, header_height + 14, Redmine::Utils::Shell.shell_quote(week_f.cweek.to_s)
left.round + 2, header_height + 14, magick_text(week_f.cweek.to_s)
])
left = left + width
week_f = week_f + 7
......
params[:image].stroke('transparent')
params[:image].strokewidth(1)
params[:image].draw('text %d,%d %s' % [
params[:indent], params[:top] + 2, Redmine::Utils::Shell.shell_quote(subject)
params[:indent], params[:top] + 2, magick_text(subject)
])
end
......
params[:image].draw('text %d,%d %s' % [
params[:subject_width] + (coords[:bar_end] || 0) + 5,
params[:top] + 1,
Redmine::Utils::Shell.shell_quote(label)
magick_text(label)
])
end
end
# Escape the passed string as a text argument in a draw rule for
# mini_magick. Note that the returned string is not shell-safe on its own.
def magick_text(str)
"'#{str.to_s.gsub(/['\\]/, '\\\\\0')}'"
end
end
end
end
test/unit/lib/redmine/helpers/gantt_test.rb
assert_equal versions.sort, Redmine::Helpers::Gantt.sort_versions!(versions.dup)
end
def test_magick_text
create_gantt
assert_equal "'foo\\'bar\\\\baz'", @gantt.send(:magick_text, "foo'bar\\baz")
end
end
    (1-1/1)