[Igarden-commit] CommonSource/Utilities RGString.cpp, 1.12, 1.12.2.1

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/CommonSource/Utilities
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20799

Modified Files:
      Tag: Release_branch_v1
	RGString.cpp 
Log Message:
Fix += operator when adding a NULL string

Index: RGString.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/Utilities/RGString.cpp,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** RGString.cpp	17 May 2006 00:03:55 -0000	1.12
--- RGString.cpp	14 Dec 2006 03:06:48 -0000	1.12.2.1
***************
*** 236,242 ****
  	oldSptr = _sptr;
  		
! 	if(oldSptr != NULL)
  	{
! 		if(s._sptr != NULL)
  		{
  			_sptr = new wchar_t[std::wcslen(s._sptr) + std::wcslen(_sptr) + 1];
--- 236,242 ----
  	oldSptr = _sptr;
  		
! 	if(s._sptr != NULL)
  	{
! 		if(oldSptr != NULL)
  		{
  			_sptr = new wchar_t[std::wcslen(s._sptr) + std::wcslen(_sptr) + 1];
***************
*** 247,257 ****
  			changed();
  		}
! 	}
! 	else
! 	{
! 		_sptr = new wchar_t[std::wcslen(s._sptr) +1 ];
! 		std::wcscpy(_sptr, s._sptr);
! 		_length = std::wcslen(_sptr);
! 		changed();
  	}
  }
--- 247,257 ----
  			changed();
  		}
! 		else
! 		{
! 			_sptr = new wchar_t[std::wcslen(s._sptr) +1 ];
! 			std::wcscpy(_sptr, s._sptr);
! 			_length = std::wcslen(_sptr);
! 			changed();
! 		}
  	}
  }