Changeset 8835

Timestamp:

02/10/08 01:08:05 (5 months ago)

Author:

nzkoz

Message:

2-0-stable: Precalculate the Backtrace of a template error to avoid raising exceptions in TemplateError#backtrace. These will abort the ruby vm. References #10936 [Aleksey Kondratenko]

Merging [8743]

Files:

• branches/2-0-stable/actionpack/lib/action_view/template_error.rb (modified) (2 diffs)

branches/2-0-stable/actionpack/lib/action_view/template_error.rb

@@ -11 +11 @@
-        base_path, assigns.dup, source, original_exception
-      @file_path = file_path
+      @backtrace = compute_backtrace
-    end
-
@@ -73 +74 @@
-    end
-
+    # don't do anything nontrivial here. Any raised exception from here becomes fatal
+    # (and can't be rescued).
-    def backtrace
-
-
-
-
+
-    end
-
-    private
+      def compute_backtrace
+        [
+          "#{source_location.capitalize}\n\n#{source_extract(4)}\n    " +
+          clean_backtrace.join("\n    ")
+        ]
+      end
+
-      def strip_base_path(path)
-        stripped_path = File.expand_path(path).gsub(@base_path, "")