[prev in list] [next in list] [prev in thread] [next in thread] 

List:       flightgear-cvs
Subject:    [Flightgear-cvslogs] CVS: FlightGear/src/AIModel AIBase.cxx, 1.36,
From:       Melchior Franz <mfranz () flightgear ! org>
Date:       2005-06-30 18:34:22
Message-ID: E1Do3ri-0007ki-00 () baron ! me ! umn ! edu
[Download RAW message or body]

Update of /var/cvs/FlightGear-0.9/FlightGear/src/AIModel
In directory baron:/tmp/cvs-serv29601

Modified Files:
	AIBase.cxx AIBase.hxx 
Log Message:
- replace one SGPropertyNode* by SGPropertyNode_ptr to avoid crash with
  temporary removeChild(); should be done even after reverting; the node
  is accessed after removal
- cleanup:  if (foo) delete foo  -->  delete foo


Index: AIBase.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/AIModel/AIBase.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** AIBase.cxx	4 Jun 2005 09:38:52 -0000	1.36
--- AIBase.cxx	30 Jun 2005 18:34:20 -0000	1.37
***************
*** 77,81 ****
      SGPropertyNode *root = globals->get_props()->getNode("ai/models", true);
      root->removeChild(_type_str.c_str(), index);
!     if (fp) delete fp;
      fp = NULL;
  }
--- 77,81 ----
      SGPropertyNode *root = globals->get_props()->getNode("ai/models", true);
      root->removeChild(_type_str.c_str(), index);
!     delete fp;
      fp = NULL;
  }

Index: AIBase.hxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/AIModel/AIBase.hxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** AIBase.hxx	4 Jun 2005 09:38:52 -0000	1.39
--- AIBase.hxx	30 Jun 2005 18:34:20 -0000	1.40
***************
*** 120,124 ****
  protected:
  
!     SGPropertyNode *props;
      FGAIManager* manager;
  
--- 120,124 ----
  protected:
  
!     SGPropertyNode_ptr props;
      FGAIManager* manager;
  


_______________________________________________
Flightgear-cvslogs mailing list
Flightgear-cvslogs@flightgear.org
http://mail.flightgear.org/mailman/listinfo/flightgear-cvslogs
2f585eeea02e2c79d7b1d8c4963bae2d
[prev in list] [next in list] [prev in thread] [next in thread]