From c0fe37ab8ea7c0e9a12113ab33a9d710be3f6b9c Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 23 Feb 2016 19:41:49 +0100 Subject: [PATCH] Fixed: Memory leak --HG-- branch : develop --- code/ryzom/client/src/cdb_synchronised.cpp | 29 ++++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/code/ryzom/client/src/cdb_synchronised.cpp b/code/ryzom/client/src/cdb_synchronised.cpp index d5239ce0d..40aa11316 100644 --- a/code/ryzom/client/src/cdb_synchronised.cpp +++ b/code/ryzom/client/src/cdb_synchronised.cpp @@ -132,18 +132,26 @@ 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(); @@ -177,7 +185,6 @@ void CCDBSynchronised::write( const string &fileName ) { nlwarning(" can't write %s : the database has not been initialized",fileName.c_str()); } - } // write //