NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd7d294f

committed

Improve pg_check_dir's handling of closedir() failures.

Avoid losing errno if readdir() fails and closedir() works. This alsoavoids leaking the directory handle when readdir() fails. Commit6f03927 introduced logic to betterhandle readdir() and closedir() failures, bu it missed these cases.Extracted from a larger patch by Marco Nenciarini.

1 parent2df854f commitd7d294fCopy full SHA for d7d294f

File tree

1 file changed

-1

lines changed

src/port
- pgcheckdir.c

1 file changed

-1

lines changed

`‎src/port/pgcheckdir.c`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ pg_check_dir(const char *dir)`
`31`	`31`	`intresult=1;`
`32`	`32`	`DIR*chkdir;`
`33`	`33`	`structdirent*file;`
	`34`	`+intreaddir_errno;`
`34`	`35`
`35`	`36`	`chkdir=opendir(dir);`
`36`	`37`
`@@ -58,8 +59,15 @@ pg_check_dir(const char *dir)`
`58`	`59`	`errno=0;`
`59`	`60`	`#endif`
`60`	`61`
`61`		`-if (errno\|\|closedir(chkdir))`
	`62`	`+if (errno)`
`62`	`63`	`result=-1;/* some kind of I/O error? */`
`63`	`64`
	`65`	`+/* Close chkdir and avoid overwriting the readdir errno on success */`
	`66`	`+readdir_errno=errno;`
	`67`	`+if (closedir(chkdir))`
	`68`	`+result=-1;/* error executing closedir */`
	`69`	`+else`
	`70`	`+errno=readdir_errno;`
	`71`	`+`
`64`	`72`	`returnresult;`
`65`	`73`	`}`

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!

Commitd7d294f

File tree

1 file changed

1 file changed

`‎src/port/pgcheckdir.c`

0 commit comments