rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tom Lane 2016-07-16 14:42:37 -04:00
parent 745513c702
commit 278148907a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/utils/adt/geo_ops.c
View File

@ -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