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

Add null checks before converting to string to avoid NPE.

Browse Source 
Motivation:

Fixing an introduced NPE by #6817

Modification:

Add null checks.

Result:

Fixes #7076 .
This commit is contained in:
Michael Andre Pearce 2017-08-10 01:30:58 +01:00 committed by Norman Maurer
parent ce4b4da583
commit 1ba592049c
3 changed files with 95 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttConnectPayload.java
View File

@ -74,7 +74,7 @@ public final class MqttConnectPayload {
*/
@Deprecated
public String willMessage() {
return new String(willMessage, CharsetUtil.UTF_8);
return willMessage == null ? null : new String(willMessage, CharsetUtil.UTF_8);
}
public byte[] willMessageInBytes() {
@ -90,7 +90,7 @@ public final class MqttConnectPayload {
*/
@Deprecated
public String password() {
return new String(password, CharsetUtil.UTF_8);
return password == null ? null : new String(password, CharsetUtil.UTF_8);
}
public byte[] passwordInBytes() {

4
codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttMessageBuilders.java
View File

@ -125,7 +125,7 @@ public final class MqttMessageBuilders {
*/
@Deprecated
public ConnectBuilder willMessage(String willMessage) {
willMessage(willMessage.getBytes(CharsetUtil.UTF_8));
willMessage(willMessage == null ? null : willMessage.getBytes(CharsetUtil.UTF_8));
return this;
}
@ -160,7 +160,7 @@ public final class MqttMessageBuilders {
*/
@Deprecated
public ConnectBuilder password(String password) {
password(password.getBytes(CharsetUtil.UTF_8));
password(password == null ? null : password.getBytes(CharsetUtil.UTF_8));
return this;
}

91
codec-mqtt/src/test/java/io/netty/handler/codec/mqtt/MqttConnectPayloadTest.java Normal file
View File

@ -0,0 +1,91 @@
/*
* Copyright 2017 The Netty Project
*
* The Netty Project licenses this file to you under the Apache License,
* version 2.0 (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.netty.handler.codec.mqtt;
import static org.junit.Assert.assertNull;
import io.netty.util.CharsetUtil;
import org.junit.Test;
public class MqttConnectPayloadTest {
@Test
public void testNullWillMessage() throws Exception {
String clientIdentifier = "clientIdentifier";
String willTopic = "willTopic";
byte[] willMessage = null;
String userName = "userName";
byte[] password = "password".getBytes(CharsetUtil.UTF_8);
MqttConnectPayload mqttConnectPayload =
new MqttConnectPayload(clientIdentifier, willTopic, willMessage, userName, password);
assertNull(mqttConnectPayload.willMessageInBytes());
assertNull(mqttConnectPayload.willMessage());
}
@Test
public void testNullPassword() throws Exception {
String clientIdentifier = "clientIdentifier";
String willTopic = "willTopic";
byte[] willMessage = "willMessage".getBytes(CharsetUtil.UTF_8);
String userName = "userName";
byte[] password = null;
MqttConnectPayload mqttConnectPayload =
new MqttConnectPayload(clientIdentifier, willTopic, willMessage, userName, password);
assertNull(mqttConnectPayload.passwordInBytes());
assertNull(mqttConnectPayload.password());
}
@Test
public void testBuilderNullPassword() throws Exception {
MqttMessageBuilders.ConnectBuilder builder = new MqttMessageBuilders.ConnectBuilder();
builder.password((String) null);
MqttConnectPayload mqttConnectPayload = builder.build().payload();
assertNull(mqttConnectPayload.passwordInBytes());
assertNull(mqttConnectPayload.password());
builder = new MqttMessageBuilders.ConnectBuilder();
builder.password((byte[]) null);
mqttConnectPayload = builder.build().payload();
assertNull(mqttConnectPayload.passwordInBytes());
assertNull(mqttConnectPayload.password());
}
@Test
public void testBuilderNullWillMessage() throws Exception {
MqttMessageBuilders.ConnectBuilder builder = new MqttMessageBuilders.ConnectBuilder();
builder.willMessage((String) null);
MqttConnectPayload mqttConnectPayload = builder.build().payload();
assertNull(mqttConnectPayload.willMessageInBytes());
assertNull(mqttConnectPayload.willMessage());
builder = new MqttMessageBuilders.ConnectBuilder();
builder.willMessage((byte[]) null);
mqttConnectPayload = builder.build().payload();
assertNull(mqttConnectPayload.willMessageInBytes());
assertNull(mqttConnectPayload.willMessage());
}
}