andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes NPE in ClientCookieDecoder

Browse Source 
Motivation:
NPE in `ClientCookieDecoder` if cookie starts with comma.

Modifications:
Check `cookieBuilder` for `null` in the return.

Result:
No fails NPE on invalid cookies.
This commit is contained in:
Nikolay Fedorovskikh 2018-04-05 22:44:08 +05:00 committed by Norman Maurer
parent c58069f284
commit 587afddb27
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec-http/src/main/java/io/netty/handler/codec/http/cookie/ClientCookieDecoder.java
View File

@ -140,7 +140,7 @@ public final class ClientCookieDecoder extends CookieDecoder {
cookieBuilder.appendAttribute(nameBegin, nameEnd, valueBegin, valueEnd);
}
}
return cookieBuilder.cookie();
return cookieBuilder != null ? cookieBuilder.cookie() : null;
}
private static class CookieBuilder {

7
codec-http/src/test/java/io/netty/handler/codec/http/cookie/ClientCookieDecoderTest.java
View File

@ -203,6 +203,13 @@ public class ClientCookieDecoderTest {
assertNull(cookie);
}
@Test
public void testDecodingInvalidValuesWithCommaAtStart() {
assertNull(ClientCookieDecoder.STRICT.decode(","));
assertNull(ClientCookieDecoder.STRICT.decode(",a"));
assertNull(ClientCookieDecoder.STRICT.decode(",a=a"));
}
@Test
public void testDecodingLongValue() {
String longValue =