diff options
author | Melanie Thielker | 2010-07-15 20:03:08 +0200 |
---|---|---|
committer | Diva Canto | 2010-07-20 14:52:25 -0700 |
commit | df55e5295fe029a9a7d23f71263cbf72c8921884 (patch) | |
tree | c5ea67b534a225b1e1c99f22dac015f51cb19a1d /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | Relaxed the ultra-conservative lock on m_items. Needs testing under linux and... (diff) | |
download | opensim-SC_OLD-df55e5295fe029a9a7d23f71263cbf72c8921884.zip opensim-SC_OLD-df55e5295fe029a9a7d23f71263cbf72c8921884.tar.gz opensim-SC_OLD-df55e5295fe029a9a7d23f71263cbf72c8921884.tar.bz2 opensim-SC_OLD-df55e5295fe029a9a7d23f71263cbf72c8921884.tar.xz |
Fix a few permissions vulnerability. Owners could cause permissions
escalation on items contained in prims using a hacked viewer
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 20d5486..0ec15c1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -600,12 +600,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
600 | item.GroupID = m_part.GroupID; | 600 | item.GroupID = m_part.GroupID; |
601 | 601 | ||
602 | if (item.AssetID == UUID.Zero) | 602 | if (item.AssetID == UUID.Zero) |
603 | item.AssetID = it.AssetID; | ||
604 | |||
605 | lock (m_items) | ||
606 | { | 603 | { |
607 | m_items[item.ItemID] = item; | 604 | item.AssetID = m_items[item.ItemID].AssetID; |
608 | m_inventorySerial++; | 605 | } |
606 | else if ((InventoryType)item.Type == InventoryType.Notecard) | ||
607 | { | ||
608 | ScenePresence presence = m_part.ParentGroup.Scene.GetScenePresence(item.OwnerID); | ||
609 | } | 609 | } |
610 | 610 | ||
611 | if (fireScriptEvents) | 611 | if (fireScriptEvents) |