Skip to content

Fix segfault when Ruby coverage is enabled with Rails 8.1 ERB templates #2541

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
george-bit wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix segfault when Ruby coverage is enabled with Rails 8.1 ERB templates #2541

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
20 changes: 14 additions & 6 deletions lib/view_component/template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ def initialize(component:, details:, lineno: nil, path: nil)

class File < Template
def initialize(component:, details:, path:)
# Rails 8.1 added a newline to the compiled ERB output in
# https://github.com/rails/rails/pull/53731
# Rails 8.1 added a newline to compiled ERB output (rails/rails#53731).
# Use -1 to compensate for correct line numbers in stack traces.
# However, negative line numbers cause segfaults when Ruby's coverage
# is enabled (bugs.ruby-lang.org/issues/19363), so use 1 in that case.
lineno =
if Rails::VERSION::MAJOR >= 8 && Rails::VERSION::MINOR > 0 && details.handler == :erb
- 1
coverage_running? ? 1 : -1
else
0
end
Expand Down Expand Up @@ -54,11 +56,13 @@ class Inline < Template
def initialize(component:, inline_template:)
details = ActionView::TemplateDetails.new(nil, inline_template.language.to_sym, nil, nil)

# Rails 8.1 added a newline to the compiled ERB output in
# https://github.com/rails/rails/pull/53731
# Rails 8.1 added a newline to compiled ERB output (rails/rails#53731).
# Subtract 1 to compensate for correct line numbers in stack traces.
# However, negative line numbers cause segfaults when Ruby's coverage
# is enabled (bugs.ruby-lang.org/issues/19363), so skip the adjustment in that case.
lineno =
if Rails::VERSION::MAJOR >= 8 && Rails::VERSION::MINOR > 0 && details.handler == :erb
inline_template.lineno - 1
coverage_running? ? inline_template.lineno : inline_template.lineno - 1
else
inline_template.lineno
end
Expand Down Expand Up @@ -126,6 +130,10 @@ def #{call_method_name}
@component.define_method(safe_method_name, @component.instance_method(@call_method_name))
end

def coverage_running?
defined?(Coverage) && Coverage.running?
end

def safe_method_name_call
m = safe_method_name
proc { send(m) }
Expand Down
Loading