Skip to content

CFE-4581: Fixed memory leak in lmdump #5871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CFE-4581: Fixed memory leak in lmdump #5871

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 47 additions & 15 deletions cf-check/lmdump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,25 +87,40 @@ int lmdump(lmdump_mode mode, const char *file)
assert(file != NULL);

int rc;
MDB_env *env = NULL;
MDB_txn *txn = NULL;
MDB_dbi dbi = 0;
MDB_cursor *cursor = NULL;

MDB_env *env;
rc = mdb_env_create(&env);
if (rc) return lmdump_report_error(rc);
if (rc != 0)
{
goto cleanup;
}

rc = mdb_env_open(env, file, MDB_NOSUBDIR | MDB_RDONLY, 0644);
if (rc) return lmdump_report_error(rc);
if (rc != 0)
{
goto cleanup;
}

MDB_txn *txn;
rc = mdb_txn_begin(env, NULL, MDB_RDONLY, &txn);
if (rc) return lmdump_report_error(rc);
if (rc != 0)
{
goto cleanup;
}

MDB_dbi dbi;
rc = mdb_open(txn, NULL, 0, &dbi);
if (rc) return lmdump_report_error(rc);
if (rc != 0)
{
goto cleanup;
}

MDB_cursor *cursor;
rc = mdb_cursor_open(txn, dbi, &cursor);
if (rc) return lmdump_report_error(rc);
if (rc != 0)
{
goto cleanup;
}

MDB_val key, data;
while ( (rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == MDB_SUCCESS )
Expand All @@ -115,14 +130,31 @@ int lmdump(lmdump_mode mode, const char *file)
if (rc != MDB_NOTFOUND)
{
// At this point, not found is expected, anything else is an error
return lmdump_report_error(rc);
goto cleanup;
}
rc = 0;
cleanup:
if (cursor != NULL)
{
mdb_cursor_close(cursor);
}
if (dbi != 0)
{
mdb_close(env, dbi);
}
if (txn != NULL)
{
mdb_txn_abort(txn);
}
if (env != NULL)
{
mdb_env_close(env);
}
mdb_cursor_close(cursor);
mdb_close(env, dbi);

mdb_txn_abort(txn);
mdb_env_close(env);

if (rc != 0)
{
return lmdump_report_error(rc);
}
return 0;
}

Expand Down
Loading