From f3ee62049e7f8c80d6fa8e34059ce35a42ddb45d Mon Sep 17 00:00:00 2001 From: Astushi Yoshikawa Date: Tue, 18 Dec 2018 13:46:52 +0900 Subject: [PATCH] avoid set null variable with @PreAuthorize and @P Fixes: gh-6300 --- .../expression/method/MethodSecurityEvaluationContext.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java index 3688f01c480..862c37c6b85 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java @@ -112,7 +112,10 @@ private void addArgumentsAsVariables() { } for (int i = 0; i < args.length; i++) { - super.setVariable(paramNames[i], args[i]); + String parameterName = paramNames[i]; + if (parameterName != null) { + super.setVariable(parameterName, args[i]); + } } }