Skip to content

Commit

Permalink
libvector/diglib: fix memory leaks (#3617)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nilason
nilason authored May 3, 2024
1 parent 763fa05 commit c783f5d
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 36 deletions.
12 changes: 10 additions & 2 deletions lib/vector/diglib/plus_area.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,10 @@ int dig_add_area(struct Plus_head *plus, int n_lines, plus_t *lines,
if (Area == NULL)
return -1;

if (dig_area_alloc_line(Area, n_lines) == -1)
if (dig_area_alloc_line(Area, n_lines) == -1) {
dig_free_area(Area);
return -1;
}

for (i = 0; i < n_lines; i++) {
line = lines[i];
Expand All @@ -220,6 +222,7 @@ int dig_add_area(struct Plus_head *plus, int n_lines, plus_t *lines,
if (topo->left != 0) {
G_warning(_("Line %d already has area/isle %d to left"), line,
topo->left);
dig_free_area(Area);
return -1;
}

Expand All @@ -230,6 +233,7 @@ int dig_add_area(struct Plus_head *plus, int n_lines, plus_t *lines,
if (topo->right != 0) {
G_warning(_("Line %d already has area/isle %d to right"), line,
topo->right);
dig_free_area(Area);
return -1;
}

Expand Down Expand Up @@ -719,8 +723,10 @@ int dig_add_isle(struct Plus_head *plus, int n_lines, plus_t *lines,
if (Isle == NULL)
return -1;

if ((dig_isle_alloc_line(Isle, n_lines)) == -1)
if ((dig_isle_alloc_line(Isle, n_lines)) == -1) {
dig_free_isle(Isle);
return -1;
}

Isle->area = 0;

Expand All @@ -734,6 +740,7 @@ int dig_add_isle(struct Plus_head *plus, int n_lines, plus_t *lines,
if (topo->left != 0) {
G_warning(_("Line %d already has area/isle %d to left"), line,
topo->left);
dig_free_isle(Isle);
return -1;
}
topo->left = -isle;
Expand All @@ -742,6 +749,7 @@ int dig_add_isle(struct Plus_head *plus, int n_lines, plus_t *lines,
if (topo->right != 0) {
G_warning(_("Line %d already has area/isle %d to right"), line,
topo->right);
dig_free_isle(Isle);
return -1;
}

Expand Down
106 changes: 72 additions & 34 deletions lib/vector/diglib/plus_struct.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,30 +68,44 @@ int dig_Rd_P_node(struct Plus_head *Plus, int n, struct gvfile *fp)
ptr = dig_alloc_node();
ptr->n_lines = cnt;

if (dig_node_alloc_line(ptr, ptr->n_lines) == -1)
if (dig_node_alloc_line(ptr, ptr->n_lines) == -1) {
dig_free_node(ptr);
return -1;
}

if (ptr->n_lines) {
if (0 >= dig__fread_port_P(ptr->lines, ptr->n_lines, fp))
if (0 >= dig__fread_port_P(ptr->lines, ptr->n_lines, fp)) {
dig_free_node(ptr);
return (-1);
if (0 >= dig__fread_port_F(ptr->angles, ptr->n_lines, fp))
}
if (0 >= dig__fread_port_F(ptr->angles, ptr->n_lines, fp)) {
dig_free_node(ptr);
return (-1);
}
}

if (Plus->with_z)
if (0 >= dig__fread_port_P(&n_edges, 1, fp)) /* reserved for edges */
if (Plus->with_z) {
if (0 >= dig__fread_port_P(&n_edges, 1, fp)) { /* reserved for edges */
dig_free_node(ptr);
return (-1);

}
}
/* here will be edges */

if (0 >= dig__fread_port_D(&(ptr->x), 1, fp))
if (0 >= dig__fread_port_D(&(ptr->x), 1, fp)) {
dig_free_node(ptr);
return (-1);
if (0 >= dig__fread_port_D(&(ptr->y), 1, fp))
}
if (0 >= dig__fread_port_D(&(ptr->y), 1, fp)) {
dig_free_node(ptr);
return (-1);
}

if (Plus->with_z) {
if (0 >= dig__fread_port_D(&(ptr->z), 1, fp))
if (0 >= dig__fread_port_D(&(ptr->z), 1, fp)) {
dig_free_node(ptr);
return (-1);
}
}
else
ptr->z = 0;
Expand Down Expand Up @@ -171,7 +185,7 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp)

/* offset */
if (0 >= dig__fread_port_O(&(ptr->offset), 1, fp, Plus->off_t_size))
return (-1);
goto free_exit_failure;

if (ptr->type == GV_POINT) {
ptr->topo = NULL;
Expand All @@ -185,58 +199,62 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp)
struct P_topo_c *topo = (struct P_topo_c *)ptr->topo;

if (0 >= dig__fread_port_P(&(topo->area), 1, fp))
return -1;
goto free_exit_failure;
}
/* lines */
else if (ptr->type & GV_LINE) {
struct P_topo_l *topo = (struct P_topo_l *)ptr->topo;

if (0 >= dig__fread_port_P(&(topo->N1), 1, fp))
return -1;
goto free_exit_failure;
if (0 >= dig__fread_port_P(&(topo->N2), 1, fp))
return -1;
goto free_exit_failure;
}
/* boundaries */
else if (ptr->type & GV_BOUNDARY) {
struct P_topo_b *topo = (struct P_topo_b *)ptr->topo;

if (0 >= dig__fread_port_P(&(topo->N1), 1, fp))
return -1;
goto free_exit_failure;
if (0 >= dig__fread_port_P(&(topo->N2), 1, fp))
return -1;
goto free_exit_failure;
if (0 >= dig__fread_port_P(&(topo->left), 1, fp))
return -1;
goto free_exit_failure;
if (0 >= dig__fread_port_P(&(topo->right), 1, fp))
return -1;
goto free_exit_failure;
}
/* faces */
else if ((ptr->type & GV_FACE) &&
Plus->with_z) { /* reserved for face edges */
struct P_topo_f *topo = (struct P_topo_f *)ptr->topo;

if (0 >= dig__fread_port_I(&n_edges, 1, fp))
return -1;
goto free_exit_failure;

/* here will be list of edges */

/* left / right volume */
if (0 >= dig__fread_port_P(&(topo->left), 1, fp))
return -1;
goto free_exit_failure;
if (0 >= dig__fread_port_P(&(topo->left), 1, fp))
return -1;
goto free_exit_failure;
}
/* kernels */
else if ((ptr->type & GV_KERNEL) &&
Plus->with_z) { /* reserved for kernel (volume number) */
struct P_topo_k *topo = (struct P_topo_k *)ptr->topo;

if (0 >= dig__fread_port_P(&(topo->volume), 1, fp))
return -1;
goto free_exit_failure;
}

Plus->Line[n] = ptr;

return (0);

free_exit_failure:
dig_free_line(ptr);
return -1;
}

int dig_Wr_P_line(struct Plus_head *Plus, int n, struct gvfile *fp)
Expand Down Expand Up @@ -350,27 +368,40 @@ int dig_Rd_P_area(struct Plus_head *Plus, int n, struct gvfile *fp)
/* boundaries */
ptr->n_lines = cnt;

if (dig_area_alloc_line(ptr, ptr->n_lines) == -1)
if (dig_area_alloc_line(ptr, ptr->n_lines) == -1) {
dig_free_area(ptr);
return -1;
}

if (ptr->n_lines)
if (0 >= dig__fread_port_P(ptr->lines, ptr->n_lines, fp))
if (ptr->n_lines) {
if (0 >= dig__fread_port_P(ptr->lines, ptr->n_lines, fp)) {
dig_free_area(ptr);
return -1;
}
}

/* isles */
if (0 >= dig__fread_port_P(&(ptr->n_isles), 1, fp))
if (0 >= dig__fread_port_P(&(ptr->n_isles), 1, fp)) {
dig_free_area(ptr);
return -1;
}

if (dig_area_alloc_isle(ptr, ptr->n_isles) == -1)
if (dig_area_alloc_isle(ptr, ptr->n_isles) == -1) {
dig_free_area(ptr);
return -1;
}

if (ptr->n_isles)
if (0 >= dig__fread_port_P(ptr->isles, ptr->n_isles, fp))
if (ptr->n_isles) {
if (0 >= dig__fread_port_P(ptr->isles, ptr->n_isles, fp)) {
dig_free_area(ptr);
return -1;

}
}
/* centroid */
if (0 >= dig__fread_port_P(&(ptr->centroid), 1, fp))
if (0 >= dig__fread_port_P(&(ptr->centroid), 1, fp)) {
dig_free_area(ptr);
return -1;
}

Plus->Area[n] = ptr;

Expand Down Expand Up @@ -435,16 +466,23 @@ int dig_Rd_P_isle(struct Plus_head *Plus, int n, struct gvfile *fp)
/* boundaries */
ptr->n_lines = cnt;

if (dig_isle_alloc_line(ptr, ptr->n_lines) == -1)
if (dig_isle_alloc_line(ptr, ptr->n_lines) == -1) {
dig_free_isle(ptr);
return -1;
}

if (ptr->n_lines)
if (0 >= dig__fread_port_P(ptr->lines, ptr->n_lines, fp))
if (ptr->n_lines) {
if (0 >= dig__fread_port_P(ptr->lines, ptr->n_lines, fp)) {
dig_free_isle(ptr);
return -1;
}
}

/* area */
if (0 >= dig__fread_port_P(&(ptr->area), 1, fp))
if (0 >= dig__fread_port_P(&(ptr->area), 1, fp)) {
dig_free_isle(ptr);
return -1;
}

Plus->Isle[n] = ptr;

Expand Down
8 changes: 8 additions & 0 deletions lib/vector/diglib/spindex.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,25 @@ int dig_spidx_init(struct Plus_head *Plus)
fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
Plus->Node_spidx = RTreeCreateTree(fd, 0, ndims);
remove(filename);
G_free(filename);

filename = G_tempfile();
fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
Plus->Line_spidx = RTreeCreateTree(fd, 0, ndims);
remove(filename);
G_free(filename);

filename = G_tempfile();
fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
Plus->Area_spidx = RTreeCreateTree(fd, 0, ndims);
remove(filename);
G_free(filename);

filename = G_tempfile();
fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
Plus->Isle_spidx = RTreeCreateTree(fd, 0, ndims);
remove(filename);
G_free(filename);

Plus->Face_spidx = NULL;
Plus->Volume_spidx = NULL;
Expand Down Expand Up @@ -124,6 +128,7 @@ void dig_spidx_free_nodes(struct Plus_head *Plus)
remove(filename);
if (!Plus->Spidx_new)
close(Plus->Node_spidx->fd);
G_free(filename);
}
else {
RTreeDestroyTree(Plus->Node_spidx);
Expand Down Expand Up @@ -156,6 +161,7 @@ void dig_spidx_free_lines(struct Plus_head *Plus)
remove(filename);
if (!Plus->Spidx_new)
close(Plus->Line_spidx->fd);
G_free(filename);
}
else {
RTreeDestroyTree(Plus->Line_spidx);
Expand Down Expand Up @@ -188,6 +194,7 @@ void dig_spidx_free_areas(struct Plus_head *Plus)
remove(filename);
if (!Plus->Spidx_new)
close(Plus->Area_spidx->fd);
G_free(filename);
}
else {
RTreeDestroyTree(Plus->Area_spidx);
Expand Down Expand Up @@ -220,6 +227,7 @@ void dig_spidx_free_isles(struct Plus_head *Plus)
remove(filename);
if (!Plus->Spidx_new)
close(Plus->Isle_spidx->fd);
G_free(filename);
}
else {
RTreeDestroyTree(Plus->Isle_spidx);
Expand Down

0 comments on commit c783f5d

Please sign in to comment.