debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtinfo: Fix coverity issues for resource leaks

Browse Source
This commit is contained in:
Peter Howkins
2018-04-04 22:07:10 +01:00
parent 9ef3b9ec68
commit 2b15c4057e
11 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_close.c
View File

@@ -172,8 +172,10 @@ __bt_sync(dbp, flags)
if (ISSET(t, B_DELCRSR)) {
if ((p = (void*)malloc(t->bt_psize)) == NULL)
return (RET_ERROR);
if ((h = mpool_get(t->bt_mp, t->bt_bcursor.pgno, 0)) == NULL)
if ((h = mpool_get(t->bt_mp, t->bt_bcursor.pgno, 0)) == NULL) {
free(p);
return (RET_ERROR);
}
memmove(p, h, t->bt_psize);
if ((status =
__bt_dleaf(t, h, t->bt_bcursor.index)) == RET_ERROR)
@@ -185,8 +187,10 @@ __bt_sync(dbp, flags)
CLR(t, B_MODIFIED);
ecrsr: if (ISSET(t, B_DELCRSR)) {
if ((h = mpool_get(t->bt_mp, t->bt_bcursor.pgno, 0)) == NULL)
if ((h = mpool_get(t->bt_mp, t->bt_bcursor.pgno, 0)) == NULL) {
free(p);
return (RET_ERROR);
}
memmove(h, p, t->bt_psize);
free(p);
mpool_put(t->bt_mp, h, MPOOL_DIRTY);

4
cde/programs/dtinfo/DtMmdb/oliasdb/c_api_book.C
View File

@@ -191,8 +191,10 @@ DtMmdbHandle** DtMmdbBookGetTabList(DtMmdbInfoRequest* request, unsigned int* le
while (*desc != '\0' && *desc != '\t') desc++;
if (*desc != '\t')
if (*desc != '\t') {
free(u);
return 0;
}
desc++;

6
cde/programs/dtinfo/DtMmdb/storage/page.C
View File

@@ -413,15 +413,17 @@ Boolean page::_alloc_slot( int slot_num, int size, char*& str_ptr )
int new_blank_len = slot_info -> string_leng() ;
if ( new_blank_len < size )
if ( new_blank_len < size ) {
delete slot_info;
return false;
}
slot_info -> set_string_ofst( end_ptr );
slot_info -> set_string_leng( size );
slot_info -> set_mode(spointer_t::DELETED, false);
slot_info -> set_forward_ptr(0);
delete slot_info;
delete slot_info;
if ( slot_num == count() ) {

4
cde/programs/dtinfo/DtMmdb/storage/page_storage.C
View File

@@ -698,8 +698,10 @@ int page_storage::deleteString(mmdb_pos_t loc, Boolean flush_opt)
spointer_t *x = y -> get_spointer(slot_num);
if ( x -> get_mode(spointer_t::DELETED) == true )
if ( x -> get_mode(spointer_t::DELETED) == true ) {
delete x;
return 0;
}
loc = x -> forward_ptr();
//debug(cerr, loc);

1
cde/programs/dtinfo/DtMmdb/utility/string.C
View File

@@ -38,6 +38,7 @@ string::string(char* str, int size)
string::~string()
{
delete sbuf;
}
char* string::c_str()