ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

do no append zero when clipping strings ( may still happen on other places)

Browse Source
This commit is contained in:
UbitUmarov
2020-02-26 16:58:41 +00:00
parent 7d7fc8f06a
commit ea8eeaa307
2 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Framework/Util.cs
View File

@@ -2597,7 +2597,7 @@ namespace OpenSim.Framework
return Utils.EmptyBytes;
if (!str.EndsWith("\0"))
str += "\0";
str += "\0";
// Because this is UTF-8 encoding and not ASCII, it's possible we
// might have gotten an oversized array even after the string trim
@@ -2605,18 +2605,41 @@ namespace OpenSim.Framework
if (data.Length > MaxLength)
{
int cut = MaxLength - 1 ;
if((data[cut] & 0x80 ) != 0 )
{
while(cut > 0 && (data[cut] & 0xc0) != 0xc0)
int cut = MaxLength - 1;
if ((data[cut] & 0x80) != 0)
{
while (cut > 0 && (data[cut] & 0xc0) != 0xc0)
cut--;
}
}
Array.Resize<byte>(ref data, cut + 1);
data[cut] = 0;
}
return data;
}
public static byte[] StringToBytesNoTerm(string str, int MaxLength)
{
if (String.IsNullOrEmpty(str))
return Utils.EmptyBytes;
// Because this is UTF-8 encoding and not ASCII, it's possible we
// might have gotten an oversized array even after the string trim
byte[] data = UTF8.GetBytes(str);
if (data.Length > MaxLength)
{
int cut = MaxLength - 1;
if ((data[cut] & 0x80) != 0)
{
while (cut > 0 && (data[cut] & 0xc0) != 0xc0)
cut--;
}
Array.Resize<byte>(ref data, cut);
}
return data;
}
/// <summary>
/// Pretty format the hashtable contents to a single line.
/// </summary>