MQTTv5 - Ignoring control chars between U+D800 and U+DFFF

jpwsutton · jpwsutton · commit aaa70d2e5da8 · 2018-06-08T13:48:56.000+01:00
Signed-off-by: James Sutton &lt;james.sutton@uk.ibm.com&gt;
diff --git a/org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttDataTypes.java b/org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttDataTypes.java
@@ -170,7 +170,9 @@ public static String decodeUTF8(DataInputStream input) throws MqttException {
 	private static void validateUTF8String(String input) throws IllegalArgumentException {
 		for (int i = 0; i < input.length(); i++) {
 			char c = input.charAt(i);
-			if (Character.getType(c) == Character.CONTROL || Character.getType(c) == Character.UNASSIGNED) {
+			if (Character.getType(c) == Character.CONTROL ||
+					Character.getType(c) == Character.UNASSIGNED ||
+					Character.getType(c) == Character.SURROGATE) {
 				throw new IllegalArgumentException(String.format("Invalid UTF-8 char: %s [%s]", c, (int) c));
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,9 @@ public static String decodeUTF8(DataInputStream input) throws MqttException {`
`170`	`170`	`private static void validateUTF8String(String input) throws IllegalArgumentException {`
`171`	`171`	`for (int i = 0; i < input.length(); i++) {`
`172`	`172`	`char c = input.charAt(i);`
`173`		`- if (Character.getType(c) == Character.CONTROL \|\| Character.getType(c) == Character.UNASSIGNED) {`
	`173`	`+ if (Character.getType(c) == Character.CONTROL \|\|`
	`174`	`+ Character.getType(c) == Character.UNASSIGNED \|\|`
	`175`	`+ Character.getType(c) == Character.SURROGATE) {`
`174`	`176`	`throw new IllegalArgumentException(String.format("Invalid UTF-8 char: %s [%s]", c, (int) c));`
`175`	`177`	`}`
`176`	`178`	`}`