aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2016-07-16 14:42:37 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2016-07-16 14:42:37 -0400
commit608cc0c413d8bafc853065f80c3b05f84493032a (patch)
treee46521c5a3b7c2210140bdab9582867a97c9819f /src
parent37276017fba88b7c7557395e2fcdaa4a61ba49ac (diff)
downloadpostgresql-608cc0c413d8bafc853065f80c3b05f84493032a.tar.gz
postgresql-608cc0c413d8bafc853065f80c3b05f84493032a.zip
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>
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/adt/geo_ops.c12
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 f7fe27a4fb3..e00c93db47b 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -2918,7 +2918,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);
@@ -2927,7 +2927,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