From feecacefc58e54e83bef527af5b4e058cdcc0403 Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Fri, 23 Jun 2017 09:41:32 -0500 Subject: [PATCH] fix: Works around a bug in Edge https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/12332457/ https://github.com/jitsi/lib-jitsi-meet/issues/498 --- .../ice4j/attribute/UsernameAttribute.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/main/java/org/ice4j/attribute/UsernameAttribute.java b/src/main/java/org/ice4j/attribute/UsernameAttribute.java index 5bdaefe..1725391 100644 --- a/src/main/java/org/ice4j/attribute/UsernameAttribute.java +++ b/src/main/java/org/ice4j/attribute/UsernameAttribute.java @@ -17,6 +17,8 @@ */ package org.ice4j.attribute; +import org.ice4j.*; + import java.util.*; /** @@ -33,6 +35,24 @@ public class UsernameAttribute extends Attribute */ public static final String NAME = "USERNAME"; + /** + * The name of the property which controls whether trailing zeroes should + * be stripped when decoding USERNAME attributes. + */ + public static final String STRIP_TRAILING_ZEROES_PNAME + = "org.ice4j.attribute.UsernameAttribute.STRIP_TRAILING_ZEROES"; + + /** + * Whether trailing zeroes should be stripped when decoding USERNAME + * attributes. This is necessary to work around a bug in Edge described + * here: + * https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/12332457/ + * and here: + * https://github.com/jitsi/lib-jitsi-meet/issues/498 + */ + private boolean stripTrailingZeroes + = StackProperties.getBoolean(STRIP_TRAILING_ZEROES_PNAME, false); + /** * Username value. */ @@ -56,8 +76,17 @@ public class UsernameAttribute extends Attribute * offset is equal to the index of the first byte after length) * @param length the length of the binary array. */ + @Override void decodeAttributeBody(byte[] attributeValue, char offset, char length) { + if (stripTrailingZeroes) + { + while (length > 0 && attributeValue[offset + length] == 0) + { + length--; + } + } + username = new byte[length]; System.arraycopy(attributeValue, offset, username, 0, length); }