ST_LocateBetweenElevations: fix segfault on interrupt #642
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Komzpa
reviewed
Sep 21, 2021
liblwgeom/lwlinearreferencing.c
Outdated
| @@ -736,6 +736,7 @@ lwpoly_clip_to_ordinate_range(const LWPOLY *poly, char ordinate, double from, do | |||
| /* Ret number of points */ | |||
| POINTARRAY *pa = ptarray_clamp_to_ordinate_range(poly->rings[i], ordinate, from, to, LW_TRUE); | |||
|
|
|||
| assert(pa); | |||
There was a problem hiding this comment.
assert will crash it on the spot here instead of the other spot. does not look like a lot of change?
There was a problem hiding this comment.
it has to be more like if (!pa) return NULL; in whole call chain and lwerror on the very upper level.
or, why don't we lwerror right in LW_ON_INTERRUPT? it's not like the calculation is going to get finished anyway.
There was a problem hiding this comment.
agree about assert -- replaced with if (!pa) return NULL;
lwgeom_clip_to_ordinate_range will handle NULL here.
postgis/liblwgeom/lwlinearreferencing.c
Lines 876 to 877 in 5476f08
kalenikaliaksandr
force-pushed
the
st_locatebetween-fix-crash
branch
2 times, most recently
from
a9e7151
to
11296b5
Compare
kalenikaliaksandr
force-pushed
the
st_locatebetween-fix-crash
branch
from
11296b5
to
33b01e0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pointarray returned by
ptarray_clamp_to_ordinate_rangeneed to be null checked before dereferencing since when request is interrupted, null is returned herepostgis/liblwgeom/lwlinearreferencing.c
Line 522 in 5476f08