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

Jump to bottom

Patch a case where nodes with very close to zero values created an infinite alloc loop. #8388

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Patch a case where nodes with very close to zero values created an infinite alloc loop. #8388

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e3ad77
Patch a case where nodes with very close to zero values created an in…
joa-quim Mar 2, 2024
e2057a2
Merge branch 'master' into grdcontour-close-zeros
joa-quim Mar 3, 2024
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
Next Next commit
Patch a case where nodes with very close to zero values created an in… 
…finite alloc loop.

The situation arose when the condition

if ((dz = z[this_side] - z[this_side+1]) == 0.0f) continue;

was never met by a tiny bit. Comparing to 0.0 is never a good idea. So I made it

if (fabs((dz = z[this_side] - z[this_side+1])) < 1e-10) continue;

I get 6 grdcontour test failures but they don't seem related to this change (more due to the endless headache of slight different grids).

Fixes #8387
  • Loading branch information
@joa-quim
joa-quim committed Mar 2, 2024
commit 6e3ad77a55d73259067ec8d912b9e3b80538b0e4
3 changes: 1 addition & 2 deletions src/gmt_support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2646,11 +2646,10 @@ GMT_LOCAL uint64_t gmtsupport_trace_contour (struct GMT_CTRL *GMT, struct GMT_GR
n_nan++;
continue;
}

/* Skip if no zero-crossing on this edge */

if (z[this_side+1] * z[this_side] > 0.0f) continue;
if ((dz = z[this_side] - z[this_side+1]) == 0.0f) continue;
if (fabs((dz = z[this_side] - z[this_side+1])) < 1e-10) continue;

/* Save normalized distance along edge from corner this_side to crossing of edge this_side */

Expand Down
Loading