lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

other spot

Browse Source
This commit is contained in:
UbitUmarov
2022-03-27 22:22:44 +01:00
parent c49dcc2fe6
commit fd7d0128fe
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Util.cs
View File

@@ -4098,12 +4098,15 @@ namespace OpenSim.Framework
public static bool ParseUniversalUserIdentifier(string value, out UUID uuid)
{
/*
if (value.Length < 36)
{
uuid = UUID.Zero;
return false;
}
return (value.Length == 36) ? UUID.TryParse(value, out uuid) : UUID.TryParse(value.Substring(0, 36), out uuid);
*/
return UUID.TryParse(value, out uuid); // uuid now only looks to first 36bytes
}
public static unsafe string RemoveUniversalUserIdentifierSecret(string value)

9
OpenSim/Services/Friends/FriendsService.cs
View File

@@ -72,13 +72,8 @@ namespace OpenSim.Services.Friends
{
FriendInfo i = new FriendInfo();
if (!UUID.TryParse(d.PrincipalID, out i.PrincipalID))
{
string tmp = string.Empty;
if (!Util.ParseUniversalUserIdentifier(d.PrincipalID, out i.PrincipalID, out tmp, out tmp, out tmp, out tmp))
// bad record. ignore this entry
continue;
}
if (!Util.ParseUniversalUserIdentifier(i.Friend, out UUID friendID))
continue; // junk entry
i.Friend = d.Friend;
i.MyFlags = Convert.ToInt32(d.Data["Flags"]);
i.TheirFlags = Convert.ToInt32(d.Data["TheirFlags"]);

6
OpenSim/Services/LLLoginService/LLLoginResponse.cs
View File

@@ -778,12 +778,10 @@ namespace OpenSim.Services.LLLoginService
if (finfo.TheirFlags == -1)
continue;
LLLoginResponse.BuddyList.BuddyInfo buddyitem = new LLLoginResponse.BuddyList.BuddyInfo(finfo.Friend);
// finfo.Friend may not be a simple uuid
if (Util.ParseUniversalUserIdentifier(finfo.Friend, out UUID friendID))
buddyitem.BuddyID = friendID.ToString();
else
if (!Util.ParseUniversalUserIdentifier(finfo.Friend, out UUID friendID))
continue; // junk entry
buddyitem.BuddyID = friendID.ToString();
buddyitem.BuddyRightsHave = finfo.TheirFlags;
buddyitem.BuddyRightsGiven = finfo.MyFlags;
buddylistreturn.AddNewBuddy(buddyitem);