OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fixes potential NulRef in MRM Security Checks.

arthursv
Adam Frisby 2009-08-16 21:23:39 +10:00
parent aea4d7c63b
commit 8621dc405e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
View File

@ -169,7 +169,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
// UUID should be changed to object owner. // UUID should be changed to object owner.
UUID owner = m_scene.RegionInfo.MasterAvatarAssignedUUID; UUID owner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
SEUser securityUser = new SEUser(owner, "Name Unassigned"); SEUser securityUser = new SEUser(owner, "Name Unassigned");
SecurityCredential creds = new SecurityCredential(securityUser); SecurityCredential creds = new SecurityCredential(securityUser, m_scene);
world = new World(m_scene, creds); world = new World(m_scene, creds);
host = new Host(new SOPObject(m_scene, localID, creds), m_scene, new ExtensionHandler(m_extensions), host = new Host(new SOPObject(m_scene, localID, creds), m_scene, new ExtensionHandler(m_extensions),

5
OpenSim/Region/OptionalModules/Scripting/Minimodule/SecurityCredential.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
@ -38,9 +38,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
private readonly ISocialEntity m_owner; private readonly ISocialEntity m_owner;
private readonly Scene m_scene; private readonly Scene m_scene;
public SecurityCredential(ISocialEntity m_owner) public SecurityCredential(ISocialEntity m_owner, Scene m_scene)
{ {
this.m_owner = m_owner; this.m_owner = m_owner;
this.m_scene = m_scene;
} }
public ISocialEntity owner public ISocialEntity owner