Skip to content

Fix sphereline_circle_pos (uninitialized memory use) #56

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.

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
merged 1 commit into from
Aug 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions expected/overlaps.out
Original file line number Diff line number Diff line change
Expand Up @@ -835,14 +835,14 @@ select 'sbox && scircle', 'f' as expected, sbox'((0d , 0d), (20d , 20d))' && sci
select 'sbox && scircle', 'f' as expected, sbox'((0d , 0d), (0d , 0d))' && scircle'<(10d , 0d) , 10d>' as actual;
?column? | expected | actual
-----------------+----------+--------
sbox && scircle | f | f
sbox && scircle | f | t
(1 row)

-- the box degenerated into the point lies in the interior of circle
select 'sbox && scircle', 'f' as expected, sbox'((0d , 0d), (0d , 0d))' && scircle'<(0d , 0d) , 10d>' as actual;
?column? | expected | actual
-----------------+----------+--------
sbox && scircle | f | f
sbox && scircle | f | t
(1 row)

-- the box and circle are degenerated into the point and coincide
Expand Down
2 changes: 1 addition & 1 deletion src/line.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ sphereline_circle_pos(const SLine *sl, const SCIRCLE *sc)
{
/* line is point */
sline_begin(&p[0], sl);
if (spoint_in_circle(&p[0], &c))
if (spoint_in_circle(&p[0], sc))
{
return PGS_CIRCLE_CONT_LINE;
}
Expand Down