瀏覽代碼

Fix NULL pointer deref crashes in WorldEditor::selectObject & WorldEditor::unSelectObject

Robert MacGregor 9 年之前
父節點
當前提交
d6226a71ca
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Engine/source/gui/worldEditor/worldEditor.cpp

+ 2 - 2
Engine/source/gui/worldEditor/worldEditor.cpp

@@ -2810,7 +2810,7 @@ void WorldEditor::clearSelection()
 
 
 void WorldEditor::selectObject( SimObject *obj )
 void WorldEditor::selectObject( SimObject *obj )
 {
 {
-   if ( mSelectionLocked || !mSelected )
+   if ( mSelectionLocked || !mSelected || !obj )
       return;
       return;
 
 
    // Don't check isSelectionEnabled of SceneObjects here as we
    // Don't check isSelectionEnabled of SceneObjects here as we
@@ -2833,7 +2833,7 @@ void WorldEditor::selectObject( const char* obj )
 
 
 void WorldEditor::unselectObject( SimObject *obj )
 void WorldEditor::unselectObject( SimObject *obj )
 {
 {
-   if ( mSelectionLocked || !mSelected )
+   if ( mSelectionLocked || !mSelected || !obj )
       return;
       return;
 
 
    if ( !objClassIgnored( obj ) && mSelected->objInSet( obj ) )
    if ( !objClassIgnored( obj ) && mSelected->objInSet( obj ) )