Skip to content
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

d.vect: Dereference after Null Check #4640

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+16 −9
Open

d.vect: Dereference after Null Check #4640

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
96eb161
Dereference after Null Check
Nov 3, 2024
38b95c6
Update display/d.vect/lines.c
ShubhamDesai Nov 3, 2024
a067584
Merge branch 'main' into issue_79
nilason Nov 5, 2024
c466361
Changes Requested
Dec 2, 2024
886471e
Merge remote-tracking branch 'origin/issue_79' into issue_79
Dec 2, 2024
dc93bee
Update display/d.vect/lines.c
ShubhamDesai Dec 2, 2024
9200ed7
Update display/d.vect/lines.c
ShubhamDesai Dec 2, 2024
02aa9ae
Fix colors with default
Dec 23, 2024
d727ef5
Resolve conflicts
Dec 23, 2024
98bb296
Formatting
Dec 23, 2024
6a1d65d
Merge branch 'main' into issue_79
nilason Feb 3, 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
25 changes: 16 additions & 9 deletions display/d.vect/lines.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,21 +334,27 @@ int draw_line(int type, int ltype, int line, const struct line_pnts *Points,
/* use random or RGB column color if given, otherwise reset */
/* centroids always use default color to stand out from underlying area
*/
if (custom_rgb && (ltype != GV_CENTROID)) {
primary_color->r = (unsigned char)red;
primary_color->g = (unsigned char)grn;
primary_color->b = (unsigned char)blu;
D_symbol2(Symb, x0, y0, primary_color, line_color);
if (Symb) {
if (custom_rgb && (ltype != GV_CENTROID)) {
primary_color->r = (unsigned char)red;
primary_color->g = (unsigned char)grn;
primary_color->b = (unsigned char)blu;
D_symbol2(Symb, x0, y0, primary_color, line_color);
}
else {
D_symbol(Symb, x0, y0, line_color, fill_color);
}
}
else
D_symbol(Symb, x0, y0, line_color, fill_color);

/* reset to defaults */
var_size = size;
rotation = 0.0;
}
else if (color || custom_rgb || zcolors) {
if (!cvarr_rgb && !cats_color_flag && !zcolors && !colors)
if (!color) {
G_warning("Color is null, assigning light gray.");
D_RGB_color(198, 198, 198);
}
else if (!cvarr_rgb && !cats_color_flag && !zcolors && !colors)
D_RGB_color(color->r, color->g, color->b);
else {
if (custom_rgb)
Expand Down Expand Up @@ -385,5 +391,6 @@ int draw_line(int type, int ltype, int line, const struct line_pnts *Points,
break;
}

G_free(Symb);
return 1;
}
Loading