Skip to content

Fix segfault in grdtrack -E<lines>+c #8729

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

Merged
joa-quim merged 2 commits into from
May 16, 2025
Merged

Fix segfault in grdtrack -E<lines>+c #8729

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c937093
FIX: in *gmt_make_profiles* , fix annotation typos of +c and +d
Dengda98 May 16, 2025
e672197
FIX: in *gmt_make_profiles* , add `get_distances` check to avoid segf…
Dengda98 May 16, 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
10 changes: 6 additions & 4 deletions src/gmt_support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11348,8 +11348,8 @@ struct GMT_DATASET *gmt_make_profiles (struct GMT_CTRL *GMT, char option, char *

/* step is given in either Cartesian units or, for geographic, in the prevailing unit (m, km) */

if (strstr (args, "+c")) continuous = true; /* Want to add distances to the output */
if (strstr (args, "+d")) get_distances = true; /* Want to join abutting profiles */
if (strstr (args, "+c")) continuous = true; /* Want to join abutting profiles */
if (strstr (args, "+d")) get_distances = true; /* Want to add distances to the output */
if (strstr (args, "+g")) gridline_units = true; /* Want degree longitudes or latitudes along a gridline */
if (strstr (args, "+p")) parallel = true; /* Want to sample along a parallel */
if (strstr (args, "+x")) GMT->current.map.loxodrome = true; /* Want to sample along a rhumbline */
Expand Down Expand Up @@ -11543,8 +11543,10 @@ struct GMT_DATASET *gmt_make_profiles (struct GMT_CTRL *GMT, char option, char *
else { /* Copy over but avoid repeating the joint */
gmt_M_memcpy (&(prev_S->data[GMT_X][start]), &(S->data[GMT_X][1]), add, double);
gmt_M_memcpy (&(prev_S->data[GMT_Y][start]), &(S->data[GMT_Y][1]), add, double);
gmt_M_memcpy (&(prev_S->data[GMT_Z][start]), &(S->data[GMT_Z][1]), add, double);
for (rec = start; rec < prev_S->n_rows; rec++) prev_S->data[GMT_Z][rec] += prev_S->data[GMT_Z][start-1];
if(get_distances){
gmt_M_memcpy (&(prev_S->data[GMT_Z][start]), &(S->data[GMT_Z][1]), add, double);
for (rec = start; rec < prev_S->n_rows; rec++) prev_S->data[GMT_Z][rec] += prev_S->data[GMT_Z][start-1];
}
gmt_free_segment (GMT, &S); /* Done with this guy */
S = prev_S;
}
Expand Down
Loading