From 08f6ee8c64047a7e1454c4f2268558ee633b627f Mon Sep 17 00:00:00 2001 From: champtar Date: Wed, 20 Apr 2016 22:02:15 +0200 Subject: [PATCH] org.ice4j.attribute: fix bytes conversion bugs (#67) http://findbugs.sourceforge.net/bugDescriptions.html#BIT_IOR_OF_SIGNED_BYTE http://findbugs.sourceforge.net/bugDescriptions.html#BIT_ADD_OF_SIGNED_BYTE Signed-off-by: Etienne CHAMPETIER --- src/main/java/org/ice4j/attribute/AttributeDecoder.java | 8 ++++---- .../org/ice4j/attribute/MessageIntegrityAttribute.java | 3 ++- .../org/ice4j/attribute/UnknownAttributesAttribute.java | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/ice4j/attribute/AttributeDecoder.java b/src/main/java/org/ice4j/attribute/AttributeDecoder.java index 0e850ab..468e853 100644 --- a/src/main/java/org/ice4j/attribute/AttributeDecoder.java +++ b/src/main/java/org/ice4j/attribute/AttributeDecoder.java @@ -54,10 +54,10 @@ public class AttributeDecoder } //Discover attribute type - char attributeType = (char)((bytes[offset] << 8) | bytes[offset + 1]); - int len1 = bytes[offset + 2] & 0xff; - int len2 = bytes[offset + 3] & 0xff; - char attributeLength = (char)((len1 << 8) | len2); + char attributeType = (char) + (((bytes[offset] & 0xFF) << 8) | (bytes[offset + 1] & 0xFF)); + char attributeLength = (char) + (((bytes[offset + 2] & 0xFF) << 8) | (bytes[offset + 3] & 0xFF)); if(attributeLength > bytes.length - offset ) throw new StunException( StunException.ILLEGAL_ARGUMENT, diff --git a/src/main/java/org/ice4j/attribute/MessageIntegrityAttribute.java b/src/main/java/org/ice4j/attribute/MessageIntegrityAttribute.java index 0b81815..6c34a81 100644 --- a/src/main/java/org/ice4j/attribute/MessageIntegrityAttribute.java +++ b/src/main/java/org/ice4j/attribute/MessageIntegrityAttribute.java @@ -282,7 +282,8 @@ public class MessageIntegrityAttribute binValue[3] = (byte)(getDataLength() & 0x00FF); byte[] key = null; - char msgType = (char)((content[0] << 8) + content[1]); + char msgType = + (char) (((content[0] & 0xFF) << 8) | (content[1] & 0xFF)); if(Message.isRequestType(msgType)) { diff --git a/src/main/java/org/ice4j/attribute/UnknownAttributesAttribute.java b/src/main/java/org/ice4j/attribute/UnknownAttributesAttribute.java index dc2a647..192f8f8 100644 --- a/src/main/java/org/ice4j/attribute/UnknownAttributesAttribute.java +++ b/src/main/java/org/ice4j/attribute/UnknownAttributesAttribute.java @@ -229,8 +229,8 @@ public class UnknownAttributesAttribute extends Attribute char originalOffset = offset; for(int i = offset; i < originalOffset + length; i += 2) { - char attributeID = (char)( (attributeValue[offset++] << 8) | - (attributeValue[offset++]) ); + char attributeID = (char) (((attributeValue[offset++] & 0xFF) << 8) + | (attributeValue[offset++] & 0xFF)); addAttributeID(attributeID); } }