postgres.git / summary / log / commit / refs

commit    278148907a971ec7fa4ffb24248103d8012155d2
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Sat Jul 16 18:42:37 2016 +0000

    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>


 src/backend/utils/adt/geo_ops.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 657bcee4fd4..0dff40ddff3 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -2848,7 +2848,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);
@@ -2857,7 +2857,15 @@ close_ps(PG_FUNCTION_ARGS)
 		   tmp->A, tmp->B, tmp->C);
 #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


[parent: 745513c70282]