From 121bb76b97707a554b2ab77aec56d97718e039ab Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Tue, 23 Feb 2016 19:42:49 +0100
Subject: [PATCH] Merge with develop

---
 code/ryzom/client/src/cdb_synchronised.cpp | 40 ++++++++++++----------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/code/ryzom/client/src/cdb_synchronised.cpp b/code/ryzom/client/src/cdb_synchronised.cpp
index d5239ce0d..3d102071b 100644
--- a/code/ryzom/client/src/cdb_synchronised.cpp
+++ b/code/ryzom/client/src/cdb_synchronised.cpp
@@ -132,22 +132,29 @@ void CCDBSynchronised::read( const string &fileName )
 
 		// value
 		token = strtok(buffer," \t");
-		if( token == NULL ) continue;
-		sint64 value;
-		fromString((const char*)token, value);
 
-		// property name
-		token = strtok(NULL," \n");
-		if( token == NULL ) continue;
-		string propName(token);
+		if (token)
+		{
+			sint64 value;
+			fromString((const char*)token, value);
 
-		// set the value of the property
-		ICDBNode::CTextId txtId(propName);
-		_Database->setProp(txtId,value);
+			// property name
+			token = strtok(NULL," \n");
+
+			if (token)
+			{
+				string propName(token);
+
+				// set the value of the property
+				ICDBNode::CTextId txtId(propName);
+				_Database->setProp(txtId, value);
+			}
+		}
+
+		delete [] buffer;
 	}
 
 	f.close();
-
 } // read //
 
 
@@ -160,7 +167,7 @@ void CCDBSynchronised::write( const string &fileName )
 {
 	bool res = false;
 
-	if( _Database != 0 )
+	if (_Database != 0)
 	{
 		FILE * f = nlfopen(fileName, "w");
 		if (f)
@@ -177,7 +184,6 @@ void CCDBSynchronised::write( const string &fileName )
 	{
 		nlwarning("<CCDBSynchronised::write> can't write %s : the database has not been initialized",fileName.c_str());
 	}
-
 } // write //
 
 
@@ -285,11 +291,9 @@ string CCDBSynchronised::getString( uint32 id )
 	{
 		return (*itStr).second;
 	}
-	else
-	{
-		nlwarning("<CCDBSynchronised::getString> string with id %d was not found",id);
-		return "";
-	}
+
+	nlwarning("<CCDBSynchronised::getString> string with id %d was not found",id);
+	return "";
 } // getString //