Index: ext/libicpf/src/str.cpp
===================================================================
diff -u -N -r338a33bbdb8c82416f0351408eea3243520784e5 -r2446443341715955423610c01b43fe7841a10e3e
--- ext/libicpf/src/str.cpp	(.../str.cpp)	(revision 338a33bbdb8c82416f0351408eea3243520784e5)
+++ ext/libicpf/src/str.cpp	(.../str.cpp)	(revision 2446443341715955423610c01b43fe7841a10e3e)
@@ -1,6 +1,6 @@
 /***************************************************************************
- *   Copyright (C) 2004 by J�zef Starosczyk                                *
- *   copyhandler@o2.pl                                                     *
+ *   Copyright (C) 2004-2006 by J�zef Starosczyk                           *
+ *   ixen@copyhandler.com                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU Library General Public License as       *
@@ -306,19 +306,17 @@
 /** Standard constructor - allocates the underlying data object
  */
 string::string() :
-	m_psd(NULL)
+	m_psd(new str_data(SDF_NONE))
 {
-	m_psd=new str_data(SDF_NONE);
 }
 
 /** Constructor allocates the underlying data object and initializes it with
  *  a given ansi string.
  * \param[in] pszStr - source ansi string
  */
 string::string(const char_t* pszStr) :
-	m_psd(NULL)
+	m_psd(new str_data(SDF_NONE))
 {
-	m_psd=new str_data(SDF_NONE);
 	set_str(pszStr);
 }
 
@@ -328,9 +326,8 @@
  * \param[in] pszStr - source unicode string
  */
 string::string(const wchar_t* pszStr) :
-	m_psd(NULL)
+	m_psd(new str_data(SDF_UNICODE))
 {
-	m_psd=new str_data(SDF_UNICODE);
 	set_str(pszStr);
 }
 #endif