Skip to content

Commit

Permalink
lib/vector/Vlib: Fix Resource Leak issues in copy.c (#4533)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShubhamDesai
ShubhamDesai authored Oct 26, 2024
1 parent 5af22b2 commit 4616b9d
Showing 1 changed file with 61 additions and 30 deletions.
91 changes: 61 additions & 30 deletions lib/vector/Vlib/copy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ int Vect_copy_map_lines_field(struct Map_info *In, int field,
struct Map_info *Out)
{
int ret, format, topo;
const char *geometry_type = NULL;
const char *map_name = NULL;

if (Vect_level(In) < 1)
G_fatal_error(
Expand Down Expand Up @@ -127,24 +129,30 @@ int Vect_copy_map_lines_field(struct Map_info *In, int field,
/* copy features */
ret += copy_lines_2(In, field, topo, Out);

if (topo == TOPO_NONE &&
if (topo == TOPO_NONE) {
/* check output feature type, centroids can be exported as
* points; boundaries as linestrings */
strcmp(Vect_get_finfo_geometry_type(Out), "polygon") == 0) {
/* copy areas - external formats and simple features access only */
ret += Vect__copy_areas(In, field, Out);
geometry_type = Vect_get_finfo_geometry_type(Out);
if (geometry_type && strcmp(geometry_type, "polygon") == 0) {
/* copy areas - external formats and simple features access only
*/
ret += Vect__copy_areas(In, field, Out);
}
G_free((void *)geometry_type);
}
}
else {
/* -> copy features on level 1 */
if (topo == TOPO_NONE)
if (topo == TOPO_NONE) {
map_name = Vect_get_full_name(In);
G_warning(_("Vector map <%s> not open on topological level. "
"Areas will be skipped!"),
Vect_get_full_name(In));
map_name);
G_free((void *)map_name);
}

ret += copy_lines_1(In, field, Out);
}

return ret > 0 ? 1 : 0;
}

Expand All @@ -161,6 +169,7 @@ int Vect_copy_map_lines_field(struct Map_info *In, int field,
int copy_lines_1(struct Map_info *In, int field, struct Map_info *Out)
{
int ret, type;
const char *map_name = NULL;

struct line_pnts *Points;
struct line_cats *Cats;
Expand All @@ -174,8 +183,9 @@ int copy_lines_1(struct Map_info *In, int field, struct Map_info *Out)
while (TRUE) {
type = Vect_read_next_line(In, Points, Cats);
if (type == -1) {
G_warning(_("Unable to read vector map <%s>"),
Vect_get_full_name(In));
map_name = Vect_get_full_name(In);
G_warning(_("Unable to read vector map <%s>"), map_name);
G_free((void *)map_name);
ret = 1;
break;
}
Expand All @@ -193,7 +203,6 @@ int copy_lines_1(struct Map_info *In, int field, struct Map_info *Out)

Vect_write_line(Out, type, Points, Cats);
}

Vect_destroy_line_struct(Points);
Vect_destroy_cats_struct(Cats);

Expand All @@ -220,6 +229,7 @@ int copy_lines_2(struct Map_info *In, int field, int topo, struct Map_info *Out)
struct line_cats *Cats, *CCats;

const char *ftype = NULL;
const char *map_name = NULL;

Points = Vect_new_line_struct();
CPoints = Vect_new_line_struct();
Expand Down Expand Up @@ -251,8 +261,9 @@ int copy_lines_2(struct Map_info *In, int field, int topo, struct Map_info *Out)
G_percent(i, nlines, 2);
type = Vect_read_line(In, Points, Cats, i);
if (type == -1) {
G_warning(_("Unable to read vector map <%s>"),
Vect_get_full_name(In));
map_name = Vect_get_full_name(In);
G_warning(_("Unable to read vector map <%s>"), map_name);
G_free((void *)map_name);
ret = 1;
break; /* free allocated space and return */
}
Expand Down Expand Up @@ -364,20 +375,22 @@ int copy_lines_2(struct Map_info *In, int field, int topo, struct Map_info *Out)

if (-1 == Vect_write_line(Out, type, Points, Cats)) {
G_warning(_("Writing new feature failed"));
return 1;
ret = 1;
goto free_exit;
}
}

if (nskipped > 0)
G_important_message(
_("%d features without category or from different layer skipped"),
nskipped);

free_exit:
Vect_destroy_line_struct(Points);
Vect_destroy_line_struct(CPoints);
Vect_destroy_line_struct(NPoints);
Vect_destroy_cats_struct(Cats);
Vect_destroy_cats_struct(CCats);
G_free((void *)ftype);

return ret;
}
Expand Down Expand Up @@ -496,6 +509,7 @@ int is_isle(struct Map_info *Map, int area)
int Vect__copy_areas(struct Map_info *In, int field, struct Map_info *Out)
{
int i, area, nareas, cat, isle, nisles, nparts_alloc, nskipped;
int ret = 0;
struct line_pnts **Points;
struct line_cats *Cats;

Expand Down Expand Up @@ -567,15 +581,17 @@ int Vect__copy_areas(struct Map_info *In, int field, struct Map_info *Out)
if (0 > V2__write_area_sfa(Out, (const struct line_pnts **)Points,
nisles + 1, Cats)) {
G_warning(_("Writing area %d failed"), area);
return -1;
ret = -1;
goto free_exit;
}
}
#ifdef HAVE_POSTGRES
else { /* building simple features geometry from topogeometry data */
if (0 > V2__update_area_pg(Out, (const struct line_pnts **)Points,
nisles + 1, cat)) {
G_warning(_("Writing area %d failed"), area);
return -1;
ret = -1;
goto free_exit;
}
}
#endif
Expand All @@ -587,11 +603,13 @@ int Vect__copy_areas(struct Map_info *In, int field, struct Map_info *Out)
nskipped);

/* free allocated space for isles */
free_exit:
for (i = 0; i < nparts_alloc; i++)
Vect_destroy_line_struct(Points[i]);
Vect_destroy_cats_struct(Cats);
G_free(Points);

return 0;
return ret;
}

/*!
Expand All @@ -615,6 +633,7 @@ int Vect_copy_tables(struct Map_info *In, struct Map_info *Out, int field)
{
int i, n, type;
struct field_info *Fi;
const char *map_name = NULL;

n = Vect_get_num_dblinks(In);

Expand All @@ -631,20 +650,23 @@ int Vect_copy_tables(struct Map_info *In, struct Map_info *Out, int field)
In->dblnk->field[i].number);
return -1;
}
if (field > 0 && Fi->number != field)
if (field > 0 && Fi->number != field) {
Vect_destroy_field_info(Fi);
continue;
}

if (Vect_copy_table(In, Out, Fi->number, Fi->number, Fi->name, type) !=
0) {

map_name = Vect_get_full_name(In);
G_warning(
_("Unable to copy table <%s> for layer %d from <%s> to <%s>"),
Fi->table, Fi->number, Vect_get_full_name(In),
Vect_get_name(Out));
Fi->table, Fi->number, map_name, Vect_get_name(Out));
G_free((void *)map_name);
Vect_destroy_field_info(Fi);
return -1;
}
Vect_destroy_field_info(Fi);
}

return 0;
}

Expand Down Expand Up @@ -729,10 +751,10 @@ int Vect_copy_table_by_cats(struct Map_info *In, struct Map_info *Out,
int field_in, int field_out, const char *field_name,
int type, int *cats, int ncats)
{
int ret;
int ret = 0;
struct field_info *Fi, *Fin;
const char *name, *key;
dbDriver *driver;
dbDriver *driver = NULL;

G_debug(2, "Vect_copy_table_by_cats(): field_in = %d field_out = %d",
field_in, field_out);
Expand All @@ -757,7 +779,7 @@ int Vect_copy_table_by_cats(struct Map_info *In, struct Map_info *Out,
if (ret == -1) {
G_warning(_("Unable to add database link for vector map <%s>"),
Out->name);
return -1;
goto free_exit;
}

if (cats)
Expand All @@ -770,7 +792,8 @@ int Vect_copy_table_by_cats(struct Map_info *In, struct Map_info *Out,
Fin->table, key, cats, ncats);
if (ret == DB_FAILED) {
G_warning(_("Unable to copy table <%s>"), Fin->table);
return -1;
ret = -1;
goto free_exit;
}

driver = db_start_driver_open_database(Fin->driver,
Expand All @@ -779,22 +802,30 @@ int Vect_copy_table_by_cats(struct Map_info *In, struct Map_info *Out,
if (!driver) {
G_warning(_("Unable to open database <%s> with driver <%s>"),
Fin->database, Fin->driver);
return -1;
ret = -1;
goto free_exit;
}

/* do not allow duplicate keys */
if (db_create_index2(driver, Fin->table, Fi->key) != DB_OK) {
G_warning(_("Unable to create index"));
return -1;
ret = -1;
goto close_db_free_exit;
}

if (db_grant_on_table(driver, Fin->table, DB_PRIV_SELECT,
DB_GROUP | DB_PUBLIC) != DB_OK) {
G_warning(_("Unable to grant privileges on table <%s>"), Fin->table);
return -1;
ret = -1;
goto close_db_free_exit;
}

close_db_free_exit:
db_close_database_shutdown_driver(driver);

return 0;
free_exit:
Vect_destroy_field_info(Fi);
Vect_destroy_field_info(Fin);

return ret;
}

0 comments on commit 4616b9d

Please sign in to comment.