The Player Project

Update of /cvsroot/playerstage/code/player/server/drivers/position/nav200
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8760

Modified Files:
	nav200.cc sicknav200.cc 
Log Message:
fixed a couple of memory errors


Index: nav200.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/position/nav200/nav200.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nav200.cc	20 Sep 2006 11:17:56 -0000	1.1
--- nav200.cc	14 Mar 2007 23:19:28 -0000	1.2
***************
*** 592,598 ****
      return -1;
  
-   uint8_t * buffer;
    int length = dataLength+5;
!   buffer = new uint8_t[length];
  
    // Create header
--- 592,597 ----
      return -1;
  
    int length = dataLength+5;
!   uint8_t * buffer = new uint8_t[length];
  
    // Create header
***************
*** 618,621 ****
--- 617,621 ----
      tcsetattr(fd, TCSANOW, &oldtio);
      fd = -1;
+     delete [] buffer;
      return -1;
    }
***************
*** 626,629 ****
--- 626,630 ----
      tcsetattr(fd, TCSANOW, &oldtio);
      fd = -1;
+     delete [] buffer;
      return -1;
    }
***************
*** 635,641 ****
--- 636,645 ----
      tcsetattr(fd, TCSANOW, &oldtio);
      fd = -1;
+     delete [] buffer;
      return -1;
    }
  
+   delete [] buffer;
+ 
    return 0;
  }

Index: sicknav200.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/position/nav200/sicknav200.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sicknav200.cc	18 Dec 2006 12:17:22 -0000	1.4
--- sicknav200.cc	14 Mar 2007 23:19:28 -0000	1.5
***************
*** 140,144 ****
      
      // Name of device used to communicate with the laser
!     const char *device_name;
      
      // storage for outgoing data
--- 140,144 ----
      
      // Name of device used to communicate with the laser
!     char *device_name;
      
      // storage for outgoing data
***************
*** 193,197 ****
  SickNAV200::~SickNAV200()
  {
!   delete device_name;
  }
  
--- 193,197 ----
  SickNAV200::~SickNAV200()
  {
!   free(device_name);
  }