tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix potential minor memory leak when copying conftrees

Browse Source
This commit is contained in:
dockes 2006-04-04 09:35:37 +00:00
parent f76d235b6d
commit f51614f415
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/utils/conftree.h
View File

@ -66,7 +66,7 @@ class ConfSimple {
/** /**
* Build the object by reading content from a string * Build the object by reading content from a string
* @param data points to the data to parse * @param data points to the data to parse.
* @param readonly if true open readonly, else rw * @param readonly if true open readonly, else rw
* @param tildexp try tilde (home dir) expansion for subsection names * @param tildexp try tilde (home dir) expansion for subsection names
*/ */
@ -127,9 +127,8 @@ class ConfSimple {
if ((status = rhs.status) == STATUS_ERROR) if ((status = rhs.status) == STATUS_ERROR)
return; return;
filename = rhs.filename; filename = rhs.filename;
if (rhs.data) { // Note: we just share the pointer, this doesnt belong to us
data = new string(*(rhs.data)); data = rhs.data;
}
submaps = rhs.submaps; submaps = rhs.submaps;
} }
@ -138,12 +137,9 @@ class ConfSimple {
*/ */
ConfSimple& operator=(const ConfSimple &rhs) { ConfSimple& operator=(const ConfSimple &rhs) {
if (this != &rhs && (status = rhs.status) != STATUS_ERROR) { if (this != &rhs && (status = rhs.status) != STATUS_ERROR) {
delete data;
data = 0;
filename = rhs.filename; filename = rhs.filename;
if (rhs.data) { // Note: we don't own data. Just share the pointer
data = new string(*(rhs.data)); data = rhs.data;
}
submaps = rhs.submaps; submaps = rhs.submaps;
} }
return *this; return *this;