aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorGannon McGibbon <gannon.mcgibbon@gmail.com>2018-10-29 13:45:26 -0400
committerGannon McGibbon <gannon.mcgibbon@gmail.com>2018-11-13 18:05:05 -0500
commit6b3faf8e502dbd238fe4b4c409e96308638297a1 (patch)
treee3257a024cdc9cacf79f4d6e38b4531ecca38da9 /actionpack/lib/action_controller
parent0b75743e345f98d3f53f5a29fcd0e91d2a370a24 (diff)
downloadrails-6b3faf8e502dbd238fe4b4c409e96308638297a1.tar.gz
rails-6b3faf8e502dbd238fe4b4c409e96308638297a1.tar.bz2
rails-6b3faf8e502dbd238fe4b4c409e96308638297a1.zip
Allow rescue from parameter parse errors
[Gannon McGibbon + Josh Cheek]
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/params_wrapper.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index a678377d4f..7361946de5 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -253,7 +253,10 @@ module ActionController
# This will display the wrapped hash in the log file.
request.filtered_parameters.merge! wrapped_filtered_hash
end
- super
+ ensure
+ # NOTE: Rescues all exceptions so they
+ # may be caught in ActionController::Rescue.
+ return super
end
private