Skip to content

lib/vector/Vlib: Fix Resource Leak Issue in dbcolumns.c #5915

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 2 commits into
base: main
Choose a base branch
from
Open

lib/vector/Vlib: Fix Resource Leak Issue in dbcolumns.c #5915

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6f5883
Fix Resource Leak Issue
Jun 19, 2025
aa69989
Update lib/vector/Vlib/dbcolumns.c
ShubhamDesai Jun 19, 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
69 changes: 42 additions & 27 deletions lib/vector/Vlib/dbcolumns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
const char *Vect_get_column_names(struct Map_info *Map, int field)
{
int num_dblinks, ncols, col;
struct field_info *fi;
struct field_info *fi = NULL;
dbDriver *driver = NULL;
dbHandle handle;
dbString table_name;
dbTable *table;
const char **col_names;
char *list;
char *list = NULL;

num_dblinks = Vect_get_num_dblinks(Map);
if (num_dblinks <= 0)
Expand All @@ -54,16 +54,20 @@ const char *Vect_get_column_names(struct Map_info *Map, int field)
if ((fi = Vect_get_field(Map, field)) == NULL)
return (NULL);
driver = db_start_driver(fi->driver);
if (driver == NULL)
if (driver == NULL) {
Vect_destroy_field_info(fi);
return (NULL);
}
db_init_handle(&handle);
db_set_handle(&handle, fi->database, NULL);
if (db_open_database(driver, &handle) != DB_OK)
return (NULL);
if (db_open_database(driver, &handle) != DB_OK) {
goto cleanup;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we only need to shutdown driver and free fi (open database just failed!).

}
db_init_string(&table_name);
db_set_string(&table_name, fi->table);
if (db_describe_table(driver, &table_name, &table) != DB_OK)
return (NULL);
if (db_describe_table(driver, &table_name, &table) != DB_OK) {
goto cleanup;
}

ncols = db_get_table_number_of_columns(table);
col_names = G_malloc(ncols * sizeof(char *));
Expand All @@ -74,8 +78,9 @@ const char *Vect_get_column_names(struct Map_info *Map, int field)
G_free(col_names);
G_debug(3, "%s", list);

db_close_database(driver);
db_shutdown_driver(driver);
cleanup:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cleanup_exit

Vect_destroy_field_info(fi);
db_close_database_shutdown_driver(driver);

return list;
}
Expand All @@ -92,13 +97,13 @@ const char *Vect_get_column_names(struct Map_info *Map, int field)
const char *Vect_get_column_types(struct Map_info *Map, int field)
{
int num_dblinks, ncols, col;
struct field_info *fi;
struct field_info *fi = NULL;
dbDriver *driver = NULL;
dbHandle handle;
dbString table_name;
dbTable *table;
const char **sqltype_names;
char *list;
char *list = NULL;

num_dblinks = Vect_get_num_dblinks(Map);
if (num_dblinks <= 0)
Expand All @@ -109,16 +114,20 @@ const char *Vect_get_column_types(struct Map_info *Map, int field)
if ((fi = Vect_get_field(Map, field)) == NULL)
return (NULL);
driver = db_start_driver(fi->driver);
if (driver == NULL)
if (driver == NULL) {
Vect_destroy_field_info(fi);
return (NULL);
}
db_init_handle(&handle);
db_set_handle(&handle, fi->database, NULL);
if (db_open_database(driver, &handle) != DB_OK)
return (NULL);
if (db_open_database(driver, &handle) != DB_OK) {
goto cleanup;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we only need to shutdown driver and free fi (open database just failed!).

}
db_init_string(&table_name);
db_set_string(&table_name, fi->table);
if (db_describe_table(driver, &table_name, &table) != DB_OK)
return (NULL);
if (db_describe_table(driver, &table_name, &table) != DB_OK) {
goto cleanup;
}

ncols = db_get_table_number_of_columns(table);
sqltype_names = G_malloc(ncols * sizeof(char *));
Expand All @@ -130,8 +139,9 @@ const char *Vect_get_column_types(struct Map_info *Map, int field)
G_free(sqltype_names);
G_debug(3, "%s", list);

db_close_database(driver);
db_shutdown_driver(driver);
cleanup:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See note above.

Vect_destroy_field_info(fi);
db_close_database_shutdown_driver(driver);

return list;
}
Expand All @@ -149,13 +159,13 @@ const char *Vect_get_column_types(struct Map_info *Map, int field)
const char *Vect_get_column_names_types(struct Map_info *Map, int field)
{
int num_dblinks, ncols, col;
struct field_info *fi;
struct field_info *fi = NULL;
dbDriver *driver = NULL;
dbHandle handle;
dbString table_name;
dbTable *table;
char **col_type_names;
char *list;
char *list = NULL;

num_dblinks = Vect_get_num_dblinks(Map);
if (num_dblinks <= 0)
Expand All @@ -166,16 +176,20 @@ const char *Vect_get_column_names_types(struct Map_info *Map, int field)
if ((fi = Vect_get_field(Map, field)) == NULL)
return (NULL);
driver = db_start_driver(fi->driver);
if (driver == NULL)
if (driver == NULL) {
Vect_destroy_field_info(fi);
return (NULL);
}
db_init_handle(&handle);
db_set_handle(&handle, fi->database, NULL);
if (db_open_database(driver, &handle) != DB_OK)
return (NULL);
if (db_open_database(driver, &handle) != DB_OK) {
goto cleanup;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same issues for Vect_get_column_names_types as for the other two function.

}
db_init_string(&table_name);
db_set_string(&table_name, fi->table);
if (db_describe_table(driver, &table_name, &table) != DB_OK)
return (NULL);
if (db_describe_table(driver, &table_name, &table) != DB_OK) {
goto cleanup;
}

ncols = db_get_table_number_of_columns(table);
col_type_names = G_malloc(ncols * sizeof(char *));
Expand All @@ -198,8 +212,9 @@ const char *Vect_get_column_names_types(struct Map_info *Map, int field)
G_free(col_type_names);
G_debug(3, "%s", list);

db_close_database(driver);
db_shutdown_driver(driver);
cleanup:
Vect_destroy_field_info(fi);
db_close_database_shutdown_driver(driver);

return list;
}
Loading