--- a/utilitylibraries/libutils/src/descriptor16tostring.cpp	Tue Aug 31 16:54:36 2010 +0300
+++ b/utilitylibraries/libutils/src/descriptor16tostring.cpp	Wed Sep 01 12:36:54 2010 +0100
@@ -37,16 +37,10 @@
     int minusone = -1;
     char* charString = new char[ilen*2+1];
     
-    if (!charString)
-    {
-    	return EInsufficientSystemMemory;
-    }
-    
     wchar_t *wcharString = new wchar_t[ilen+1];
     
-    if (!wcharString)
+    if (!charString || !wcharString)
     {
-    	delete []charString;
     	return EInsufficientSystemMemory;
     }
     
@@ -83,17 +77,10 @@
     int ilen = aSrc.Length(), retval = ESuccess;
     int minusone = -1;
     char* charString = new char[ilen*2+1];
-    
-    if (!charString)
-    {
-    	return EInsufficientSystemMemory;
-    }
-    
     wchar_t *wcharString = new wchar_t[ilen+1];
     
-    if (!wcharString)
+    if (!charString || !wcharString)
     {
-    	delete []charString;
     	return EInsufficientSystemMemory;
     }
     
@@ -131,16 +118,10 @@
     unsigned int ilen= aSrc.Length();
 	  int minusone = -1;
 	  char* charString = new char[ilen*2+1];
-	  
-	  if (!charString)
-    {
-    	return EInsufficientSystemMemory;
-    }
     wchar_t *wcharString = new wchar_t[ilen+1];
     
-    if (!wcharString)
+    if (!charString || !wcharString)
     {
-    	delete []charString;
     	return EInsufficientSystemMemory;
     }
     
@@ -177,19 +158,12 @@
 {
     int retval = ESuccess;	
 	  int ilen= aSrc.Length();
-	  int minusone = -1;
+	int minusone = -1;
 	  char* buf = new char[ilen*2 +1];
-	  
-	  if (!buf)
-    {
-    	return EInsufficientSystemMemory;
-    }
-    
     wchar_t *wcharString = new wchar_t[ilen+1];
     
-    if (!wcharString)
+    if (!buf || !wcharString)
     {
-    	delete []buf;
     	return EInsufficientSystemMemory;
     }
     
@@ -246,18 +220,11 @@
     	}
     }
     
-	  char* buf = new char[ilen*2 +1];
-	
-	  if (!buf)
-    {
-    	return EInsufficientSystemMemory;
-    }
-    
+	char* buf = new char[ilen*2 +1];
     wchar_t *wcharString = new wchar_t[ilen+1];
     
-    if (!wcharString)
+    if (!buf || !wcharString)
     {
-    	delete []buf;
     	return EInsufficientSystemMemory;
     }
     
@@ -268,7 +235,7 @@
 	if(minusone != wcstombs(buf, wcharString, ilen*2))
 	{
 	    buf[ilen*2] = '\0';
-	    aDes.assign(buf, ilen*2);		
+	    aDes.append(buf, ilen*2);		
 		
 	}
 	else 
@@ -303,17 +270,10 @@
     }
     
     char* buf = new char[ilen*2 +1];
-        
-    if (!buf)
-    {
-    	return EInsufficientSystemMemory;
-    }
-    
     wchar_t *wcharString = new wchar_t[ilen+1];
     
-    if (!wcharString)
+    if (!buf || !wcharString)
     {
-    	delete []buf;
     	return EInsufficientSystemMemory;
     }
     
@@ -361,17 +321,10 @@
    }
 
    char* buf = new char[ilen*2 +1];
-   
-   if (!buf)
-   {
-       return EInsufficientSystemMemory;
-   }
-   
    wchar_t *wcharString = new wchar_t[ilen+1];
     
-   if (!wcharString)
+   if (!buf || !wcharString)
    {
-   	   delete []buf;
        return EInsufficientSystemMemory;
    }