Skip to content

Commit effa7e1

Browse files
author
Dave Syer
committed
Fix index out of bounds for key-value with no value
Fixes spring-atticgh-249
1 parent 4e6db69 commit effa7e1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/annotation/builders/ClientDetailsServiceBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public ClientBuilder additionalInformation(String... pairs) {
203203
}
204204
int index = pair.indexOf(separator);
205205
String key = pair.substring(0, index > 0 ? index : pair.length());
206-
String value = index > 0 ? null : pair.substring(index);
206+
String value = index > 0 ? pair.substring(index) : null;
207207
this.additionalInformation.put(key, (Object) value);
208208
}
209209
return this;

spring-security-oauth2/src/test/java/org/springframework/security/oauth2/config/annotation/AuthorizationServerConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
147147
.authorities("ROLE_CLIENT", "ROLE_TRUSTED_CLIENT")
148148
.scopes("read", "write", "trust")
149149
.accessTokenValiditySeconds(60)
150-
.additionalInformation("foo:bar", "spam:bucket");
150+
.additionalInformation("foo:bar", "spam:bucket", "crap");
151151
// @formatter:on
152152
}
153153

0 commit comments

Comments
 (0)