AriasCreations/LSL-PyOptimizer
3
0
Fork 0
mirror of https://github.com/Sei-Lisa/LSL-PyOptimizer synced 2025-07-01 15:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Additional fixes to llBase64ToString behaviour.

Browse source 
llBase64ToString hid another surprise: characters in range from U+0000 to U+001F are substituted by "?" except for tabs (\x09), form feeds (\x0A), shift ins (\x0F) and unit separators (\x1F), which were kept verbatim. So, mimic this behaviour.
This commit is contained in:
Sei Lisa 2017-01-19 07:00:06 +01:00
parent 1dfcb16d5a
commit d1ff8a86dd
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lslopt/lslbasefuncs.py
View file

@ -925,7 +925,7 @@ b64tos_re = re.compile(
b'('
# Those pass through and are caught by InternalUTF8toString:
b'\x00$' # NUL at last position (zstr removes it)
b'|[\x01-\x7F\xFE\xFF]|[\xC2-\xDF][\x80-\xBF]'
b'|[\x09\x0A\x0F\x1F-\x7F\xFE\xFF]|[\xC2-\xDF][\x80-\xBF]'
b'|(?:\xE0[\xA0-\xBF]|[\xE1-\xEF][\x80-\xBF])[\x80-\xBF]'
b'|(?:\xF0[\x90-\xBF]|[\xF1-\xF7][\x80-\xBF])[\x80-\xBF]{2}'
b'|(?:\xF8[\x88-\xBF]|[\xF9-\xFB][\x80-\xBF])[\x80-\xBF]{3}'
@ -933,7 +933,7 @@ b64tos_re = re.compile(
b')|('
# Those are caught here and substituted by a single "?"
# (greediness is important here):
b'[\x00\x80-\xBF]'
b'[\x00-\x1F\x80-\xBF]'
b'|[\xC0-\xDF][\x80-\xBF]?'
b'|[\xE0-\xEF][\x80-\xBF]{0,2}'
b'|[\xF0-\xF7][\x80-\xBF]{0,3}'
@ -958,7 +958,8 @@ def llBase64ToString(s):
# UTF-8 does. This causes inconsistencies in the number of ?'s returned.
# In llBase64ToString, trailing NUL is stripped, and embedded NULs are
# converted to "?".
# converted to "?". In addition, characters in range 00-1F are also
# converted to "?" except for \x09, \x0A, \x0F, \x1F.
byteseq = bytearray(b64decode(s + u'=' * (-len(s) & 3)))