diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-07-16 14:42:37 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-07-16 14:42:37 -0400 |
| commit | 16e28fcec2fe235abddd501c17536c3b15a4dcec (patch) | |
| tree | a896738241c226f1a387447ca888bc9b87d14bf9 | |
| parent | 2e51ae1f62c8273664ec489349b155f889658ec4 (diff) | |
Fix crash in close_ps() for NaN input coordinates.
The Assert() here seems unreasonably optimistic. Andreas Seltenreich
found that it could fail with NaNs in the input geometries, and it
seems likely to me that it might fail in corner cases due to roundoff
error, even for ordinary input values. As a band-aid, make the function
return SQL NULL instead of crashing.
Report: <87d1md1xji.fsf@credativ.de>
| -rw-r--r-- | src/backend/utils/adt/geo_ops.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index fdbeaadbb55..55fce191fb0 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -2913,7 +2913,7 @@ close_ps(PG_FUNCTION_ARGS) } /* - * at this point the "normal" from point will hit lseg. The closet point + * at this point the "normal" from point will hit lseg. The closest point * will be somewhere on the lseg */ tmp = line_construct_pm(pt, invm); @@ -2922,7 +2922,15 @@ close_ps(PG_FUNCTION_ARGS) tmp->A, tmp->B, tmp->C, tmp->m); #endif result = interpt_sl(lseg, tmp); - Assert(result != NULL); + + /* + * ordinarily we should always find an intersection point, but that could + * fail in the presence of NaN coordinates, and perhaps even from simple + * roundoff issues. Return a SQL NULL if so. + */ + if (result == NULL) + PG_RETURN_NULL(); + #ifdef GEODEBUG printf("close_ps- result.x %f result.y %f\n", result->x, result->y); #endif |