root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 no patch

Browse Source 
Files correlati     : 
Commento            :

Aggiunta macro SAFE_DELETE

git-svn-id: svn://10.65.10.50/branches/R_10_00@23340 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
bonazzi 2016-09-27 14:39:28 +00:00
parent 74276c081e
commit b6fe9f2419
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/include/recset.cpp
View File

@ -1623,16 +1623,11 @@ void TISAM_recordset::reset()
void TISAM_recordset::requery() void TISAM_recordset::requery()
{ {
if (_cursor != NULL) if (_cursor == NULL || not_frozen())
{ {
delete _cursor; SAFE_DELETE(_cursor);
_cursor = NULL; SAFE_DELETE(_relation);
} }
if (_relation != NULL)
{
delete _relation;
_relation = NULL;
}
} }
void TISAM_recordset::set(const char* use) void TISAM_recordset::set(const char* use)

15
src/include/relation.cpp
View File

@ -1494,7 +1494,7 @@ void TCursor::filter(
if (filterchanged) if (filterchanged)
{ {
_filter = fil; _filter = fil;
if (_fexpr) delete _fexpr; SAFE_DELETE(_fexpr);
_frefs.destroy(); _frefs.destroy();
TTypeexp type = (_filter.find('"') >= 0) ? _strexpr : _numexpr; TTypeexp type = (_filter.find('"') >= 0) ? _strexpr : _numexpr;
if (_filter.not_empty()) if (_filter.not_empty())
@ -1731,9 +1731,8 @@ TCursor::~TCursor()
} }
::remove(_indexname); ::remove(_indexname);
} }
delete _page; SAFE_DELETE(_page);
if (_fexpr) SAFE_DELETE(_fexpr);
delete _fexpr;
} }
@ -1868,8 +1867,7 @@ bool TCursor::scan(CURSOR_SCAN_FUNC func, void* pJolly, const char* msg)
} }
} }
freeze(false); freeze(false);
if (pi != NULL) SAFE_DELETE(pi);
delete pi;
} }
return ok; return ok;
} }
@ -3258,9 +3256,8 @@ TSortedfile::TSortedfile(int logicnum, TRelation* rel, const char* ordexpr, cons
// @mfunc Distruttore // @mfunc Distruttore
TSortedfile::~TSortedfile() TSortedfile::~TSortedfile()
{ {
delete _curs; SAFE_DELETE(_curs);
if (_rel) SAFE_DELETE(_rel);
delete _rel;
} }
// //