Skip to content

d.graph: Fix Resource Leak Issue in do_graph.c #6329

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: main
Choose a base branch
from
+13 −7
Open

d.graph: Fix Resource Leak Issue in do_graph.c #6329

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
20 changes: 13 additions & 7 deletions display/d.graph/do_graph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,11 @@ int do_symbol(const char *str)
double size;
double ix, iy;
char *symb_name;
SYMBOL *Symb;
SYMBOL *Symb = NULL;
char *line_color_str, *fill_color_str;
RGBA_Color *line_color, *fill_color;
int R, G, B, ret;
int ret_value = 0;

line_color = G_malloc(sizeof(RGBA_Color));
fill_color = G_malloc(sizeof(RGBA_Color));
Expand All @@ -326,7 +327,8 @@ int do_symbol(const char *str)
if (sscanf(str, "%*s %s %lf %lf %lf %s %s", symb_name, &size, &xper, &yper,
line_color_str, fill_color_str) < 4) {
G_warning(_("Problem parsing command [%s]"), str);
return (-1);
ret_value = -1;
goto cleanup_and_exit;
}

ix = xper;
Expand All @@ -348,7 +350,8 @@ int do_symbol(const char *str)
line_color->a = RGBA_COLOR_NONE;
else {
G_warning(_("[%s]: No such color"), line_color_str);
return (-1);
ret_value = -1;
goto cleanup_and_exit;
}

/* parse fill color */
Expand All @@ -363,14 +366,16 @@ int do_symbol(const char *str)
fill_color->a = RGBA_COLOR_NONE;
else {
G_warning(_("[%s]: No such color"), fill_color_str);
return (-1);
ret_value = -1;
goto cleanup_and_exit;
}

Symb = S_read(symb_name);

if (Symb == NULL) {
G_warning(_("Cannot read symbol, cannot display points"));
return (-1);
ret_value = -1;
goto cleanup_and_exit;
}
else
S_stroke(Symb, size, rotation, 0);
Expand All @@ -384,14 +389,15 @@ int do_symbol(const char *str)
D_use_color(D_parse_color(DEFAULT_BG_COLOR, 0));
else /* unset or bad */
D_RGB_color(line_color->r, line_color->g, line_color->b);

cleanup_and_exit:
G_free(symb_name);
G_free(line_color_str);
G_free(fill_color_str);
G_free(line_color);
G_free(fill_color);
G_free(Symb);
Copy link
Contributor

Choose a reason for hiding this comment

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

A SYMBOL is a struct, which can't be simply freed. Please take a look att its definition.


return (0);
return ret_value;
}

/* RGBA are 0-255; alpha is only used as an on/off switch. maybe test a<127<a ?
Expand Down
Loading