NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6563fb2

committed

Fix fd.c to preserve errno where needed.

PathNameOpenFile failed to ensure that the correct value of errno wasreturned to its caller after a failure (because it incorrectly supposedthat free() can never change errno). In some cases this would resultin a user-visible failure because an expected ENOENT errno was replacedwith something else. Bogus EINVAL failures have been observed on OS X,for example.There were also a couple of places that could mangle an important valueof errno if FDDEBUG was defined. While the usefulness of that debugsupport is highly debatable, we might as well make it safe to use,so add errno save/restore logic to the DO_DB macro.Per bug #8167 from Nelson Minar, diagnosed by RhodiumToad.Back-patch to all supported branches.

1 parente7bfc7e commit6563fb2Copy full SHA for 6563fb2

File tree

1 file changed

+13

-5

lines changed

src/backend/storage/file
- fd.c

1 file changed

+13

-5

lines changed

`‎src/backend/storage/file/fd.c`

Lines changed: 13 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,15 @@ intmax_safe_fds = 32;/* default if not changed */`
`128`	`128`	`/* Debugging.... */`
`129`	`129`
`130`	`130`	`#ifdefFDDEBUG`
`131`		`-#defineDO_DB(A) A`
	`131`	`+#defineDO_DB(A) \`
	`132`	`+do { \`
	`133`	`+int_do_db_save_errno = errno; \`
	`134`	`+A; \`
	`135`	`+errno = _do_db_save_errno; \`
	`136`	`+} while (0)`
`132`	`137`	`#else`
`133`		`-#defineDO_DB(A)/* A */`
	`138`	`+#defineDO_DB(A) \`
	`139`	`+((void) 0)`
`134`	`140`	`#endif`
`135`	`141`
`136`	`142`	`#defineVFD_CLOSED (-1)`
`@@ -703,7 +709,7 @@ LruInsert(File file)`
`703`	`709`	`if (vfdP->fd<0)`
`704`	`710`	`{`
`705`	`711`	`DO_DB(elog(LOG,"RE_OPEN FAILED: %d",errno));`
`706`		`-returnvfdP->fd;`
	`712`	`+return-1;`
`707`	`713`	`}`
`708`	`714`	`else`
`709`	`715`	`{`
`@@ -754,7 +760,7 @@ AllocateVfd(void)`
`754`	`760`	`Indexi;`
`755`	`761`	`Filefile;`
`756`	`762`
`757`		`-DO_DB(elog(LOG,"AllocateVfd. Size %lu",SizeVfdCache));`
	`763`	`+DO_DB(elog(LOG,"AllocateVfd. Size %lu",(unsigned long)SizeVfdCache));`
`758`	`764`
`759`	`765`	`Assert(SizeVfdCache>0);/* InitFileAccess not called? */`
`760`	`766`
`@@ -911,8 +917,11 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)`
`911`	`917`
`912`	`918`	`if (vfdP->fd<0)`
`913`	`919`	`{`
	`920`	`+intsave_errno=errno;`
	`921`	`+`
`914`	`922`	`FreeVfd(file);`
`915`	`923`	`free(fnamecopy);`
	`924`	`+errno=save_errno;`
`916`	`925`	`return-1;`
`917`	`926`	`}`
`918`	`927`	`++nfile;`
`@@ -1554,7 +1563,6 @@ OpenTransientFile(FileName fileName, int fileFlags, int fileMode)`
`1554`	`1563`	`{`
`1555`	`1564`	`intfd;`
`1556`	`1565`
`1557`		`-`
`1558`	`1566`	`DO_DB(elog(LOG,"OpenTransientFile: Allocated %d (%s)",`
`1559`	`1567`	`numAllocatedDescs,fileName));`
`1560`	`1568`

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!

Commit6563fb2

File tree

1 file changed

1 file changed

`‎src/backend/storage/file/fd.c`

0 commit comments