fix unicode null handling

markreidvfx · Apr 26, 2019 · 37de8c1 · 37de8c1
1 parent 49be156
commit 37de8c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/aaf2/mxf.py b/aaf2/mxf.py
@@ -54,7 +54,7 @@ def decode_strong_ref_array(data):
 
 
 def decode_utf16be(data):
-    return data.decode('utf-16be').rstrip('\x00')
+    return data.decode('utf-16be').split(u'\x00')[0]
 
 def decode_auid(data):
     return AUID(bytes_be=data)

diff --git a/aaf2/utils.py b/aaf2/utils.py
@@ -78,7 +78,7 @@ def read_filetime(f):
     return read_u64le(f)
 
 def decode_utf16le(data):
-    return data.decode('utf-16le').rstrip('\x00')
+    return data.decode('utf-16le').split(u'\x00')[0]
 
 def encode_utf16le(data):
     return data.encode("utf-16le") + b"\x00\x00"