index 7da05be687bb9f52277525a5f5a2a637d194d793..9ede9d297e6977314f063367dbb4cce6fd17699e 100644 (file)
@@ -76,15 +76,18 @@ pg_strtof(const char *nptr, char **endptr)
{
int caller_errno = errno;
float fresult;
+ char *myendptr;
errno = 0;
- fresult = (strtof) (nptr, endptr);
+ fresult = (strtof) (nptr, &myendptr);
+ if (endptr)
+ *endptr = myendptr;
if (errno)
{
/* On error, just return the error to the caller. */
return fresult;
}
- else if ((*endptr == nptr) || isnan(fresult) ||
+ else if ((myendptr == nptr) || isnan(fresult) ||
((fresult >= FLT_MIN || fresult <= -FLT_MIN) && !isinf(fresult)))
{
/*
@@ -98,7 +101,8 @@ pg_strtof(const char *nptr, char **endptr)
else
{
/*
- * Try again. errno is already 0 here.
+ * Try again. errno is already 0 here, and we assume that the endptr
+ * won't be any different.
*/
double dresult = strtod(nptr, NULL);