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

Ensure no null values are used when add/set headers.

Browse Source 
Motivation:

We need to ensure we never allow to have null values set on headers, otherwise we will see a NPE during encoding them.

Modifications:

Add null check.

Result:

Correctly throw exception when a null header value is added/set
This commit is contained in:
Norman Maurer 2015-06-03 11:22:33 +02:00
parent 74c0f4ce14
commit de1f1a61f3
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpHeaders.java
View File

@ -29,6 +29,8 @@ import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.Set;
import static io.netty.util.internal.ObjectUtil.checkNotNull;
public class DefaultHttpHeaders extends HttpHeaders {
private static final int BUCKET_SIZE = 17;
@ -382,9 +384,7 @@ public class DefaultHttpHeaders extends HttpHeaders {
}
private static CharSequence toCharSequence(Object value) {
if (value == null) {
return null;
}
checkNotNull(value, "value");
if (value instanceof CharSequence) {
return (CharSequence) value;
}

12
codec-http/src/test/java/io/netty/handler/codec/http/HttpHeadersTest.java
View File

@ -55,4 +55,16 @@ public class HttpHeadersTest {
assertThat(HttpHeaders.equalsIgnoreCase("bar", null), is(false));
assertThat(HttpHeaders.equalsIgnoreCase("FoO", "fOo"), is(true));
}
@Test(expected = NullPointerException.class)
public void testSetNullHeaderValueValidate() {
HttpHeaders headers = new DefaultHttpHeaders(true);
headers.set("test", (CharSequence) null);
}
@Test(expected = NullPointerException.class)
public void testSetNullHeaderValueNotValidate() {
HttpHeaders headers = new DefaultHttpHeaders(false);
headers.set("test", (CharSequence) null);
}
}