Skip to content

CDRIVER-6157 add missing _mongoc_gridfs_bucket_opts_cleanup #2178

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

Merged
merged 2 commits into from
Nov 25, 2025
Merged

CDRIVER-6157 add missing _mongoc_gridfs_bucket_opts_cleanup #2178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d72e26
CDRIVER-6157 add missing `_mongoc_gridfs_bucket_opts_cleanup`
kevinAlbs Nov 21, 2025
55d7f8f
require live server
kevinAlbs Nov 21, 2025
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
1 change: 1 addition & 0 deletions src/libmongoc/src/mongoc/mongoc-gridfs-bucket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ mongoc_gridfs_bucket_new(mongoc_database_t *db,
"bucketName \"%s\" must have fewer than %d characters",
gridfs_opts.bucketName,
(int)(sizeof(buf) - (strlen(".chunks") + 1)));
_mongoc_gridfs_bucket_opts_cleanup(&gridfs_opts);
return NULL;
}

Expand Down
39 changes: 39 additions & 0 deletions src/libmongoc/tests/test-mongoc-gridfs-bucket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,6 +1222,44 @@ test_bad_sizes(void)
mongoc_client_destroy(client);
}

// test_big_bucket_name is a regression test for CDRIVER-6157.
static void
test_big_bucket_name(void)
{
mongoc_client_t *client = test_framework_new_default_client();
mongoc_database_t *db = mongoc_client_get_database(client, "db");

// Create options:
bson_t opts = BSON_INITIALIZER;
{
// Use too-big bucket name to trigger error:
char *big_name = bson_malloc(256);
memset(big_name, 'a', 255);
big_name[255] = '\0';
BSON_APPEND_UTF8(&opts, "bucketName", big_name);
bson_free(big_name);

// Add a write concern to reproduce memory leak:
mongoc_write_concern_t *wc = mongoc_write_concern_new();
mongoc_write_concern_set_w(wc, MONGOC_WRITE_CONCERN_W_MAJORITY);
ASSERT(mongoc_write_concern_append(wc, &opts));
mongoc_write_concern_destroy(wc);
}

// Expect error creating bucket, but not a leak:
{
bson_error_t error;
mongoc_gridfs_bucket_t *bucket = mongoc_gridfs_bucket_new(db, &opts, NULL, &error);
ASSERT(!bucket);
ASSERT_ERROR_CONTAINS(error, MONGOC_ERROR_COMMAND, MONGOC_ERROR_COMMAND_INVALID_ARG, "must have fewer");
mongoc_gridfs_bucket_destroy(bucket);
}

bson_destroy(&opts);
mongoc_database_destroy(db);
mongoc_client_destroy(client);
}

void
test_gridfs_bucket_install(TestSuite *suite)
{
Expand All @@ -1246,4 +1284,5 @@ test_gridfs_bucket_install(TestSuite *suite)
test_framework_skip_if_no_crypto);
TestSuite_AddLive(suite, "/gridfs/options", test_gridfs_bucket_opts);
TestSuite_AddLive(suite, "/gridfs/bad_sizes", test_bad_sizes);
TestSuite_AddLive(suite, "/gridfs/big_bucket_name", test_big_bucket_name);
}