NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd69c781

committed

Fix pg_strtof() to not crash on NULL endptr.

We had managed not to notice this simple oversight because noneof our calls exercised the case --- until commit8f42718.That led to pg_dump crashing on any platform that uses this code(currently Cygwin and Mingw).Even though there's no immediate bug in the back branches, backpatch,because a non-POSIX-compliant strtof() substitute is trouble waitingto happen for extensions or future back-patches.Diagnosed-by: Alexander Lakhin <exclusion@gmail.com>Author: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://postgr.es/m/339b3902-4e98-4e31-a744-94e43b7b9292@gmail.comBackpatch-through: 13

1 parentee78823 commitd69c781Copy full SHA for d69c781

File tree

1 file changed

-3

lines changed

src/port
- strtof.c

1 file changed

-3

lines changed

`‎src/port/strtof.c`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,18 @@ pg_strtof(const char nptr, char *endptr)`
`31`	`31`	`{`
`32`	`32`	`intcaller_errno=errno;`
`33`	`33`	`floatfresult;`
	`34`	`+char*myendptr;`
`34`	`35`
`35`	`36`	`errno=0;`
`36`		`-fresult= (strtof) (nptr,endptr);`
	`37`	`+fresult= (strtof) (nptr,&myendptr);`
	`38`	`+if (endptr)`
	`39`	`+*endptr=myendptr;`
`37`	`40`	`if (errno)`
`38`	`41`	`{`
`39`	`42`	`/* On error, just return the error to the caller. */`
`40`	`43`	`returnfresult;`
`41`	`44`	`}`
`42`		`-elseif ((*endptr==nptr)\|\|isnan(fresult)\|\|`
	`45`	`+elseif ((myendptr==nptr)\|\|isnan(fresult)\|\|`
`43`	`46`	`((fresult >=FLT_MIN\|\|fresult <=-FLT_MIN)&& !isinf(fresult)))`
`44`	`47`	`{`
`45`	`48`	`/*`
`@@ -53,7 +56,8 @@ pg_strtof(const char nptr, char *endptr)`
`53`	`56`	`else`
`54`	`57`	`{`
`55`	`58`	`/*`
`56`		`- * Try again. errno is already 0 here.`
	`59`	`+ * Try again. errno is already 0 here, and we assume that the endptr`
	`60`	`+ * won't be any different.`
`57`	`61`	`*/`
`58`	`62`	`doubledresult=strtod(nptr,NULL);`
`59`	`63`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd69c781

File tree

1 file changed

1 file changed

`‎src/port/strtof.c`

0 commit comments