NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit95ff5b3

committed

Further tweaking of the readfile() function in pg_ctl.

Don't leak a file descriptor if the file is empty or we can't read its size.Expect there to be a newline at the end of the last line, too. If thereisn't, ignore anything after the last newline. This makes it a tiny bitmore robust in case the file is appended to concurrently, so that we don'treturn the last line if it hasn't been fully written yet. And this makesthe code a bit less obscure, anyway. Per Tom Lane's suggestion.Backpatch to all supported branches.

1 parentafdc751 commit95ff5b3Copy full SHA for 95ff5b3

File tree

1 file changed

+11

-4

lines changed

src/bin/pg_ctl
- pg_ctl.c

1 file changed

+11

-4

lines changed

`‎src/bin/pg_ctl/pg_ctl.c`

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -320,10 +320,14 @@ readfile(const char *path)`
`320`	`320`	`if (fd<0)`
`321`	`321`	`returnNULL;`
`322`	`322`	`if (fstat(fd,&statbuf)<0)`
	`323`	`+{`
	`324`	`+close(fd);`
`323`	`325`	`returnNULL;`
	`326`	`+}`
`324`	`327`	`if (statbuf.st_size==0)`
`325`	`328`	`{`
`326`	`329`	`/* empty file */`
	`330`	`+close(fd);`
`327`	`331`	`result= (char*)pg_malloc(sizeof(char));`
`328`	`332`	`*result=NULL;`
`329`	`333`	`returnresult;`
`@@ -339,14 +343,17 @@ readfile(const char *path)`
`339`	`343`	`returnNULL;`
`340`	`344`	`}`
`341`	`345`
`342`		`-/* count newlines */`
	`346`	`+/*`
	`347`	`+ * Count newlines. We expect there to be a newline after each full line,`
	`348`	`+ * including one at the end of file. If there isn't a newline at the end,`
	`349`	`+ * any characters after the last newline will be ignored.`
	`350`	`+ */`
`343`	`351`	`nlines=0;`
`344`		`-for (i=0;i<len-1;i++)`
	`352`	`+for (i=0;i<len;i++)`
`345`	`353`	`{`
`346`	`354`	`if (buffer[i]=='\n')`
`347`	`355`	`nlines++;`
`348`	`356`	`}`
`349`		`-nlines++;/* account for the last line */`
`350`	`357`
`351`	`358`	`/* set up the result buffer */`
`352`	`359`	`result= (char*)pg_malloc((nlines+1)sizeof(char*));`
`@@ -356,7 +363,7 @@ readfile(const char *path)`
`356`	`363`	`n=0;`
`357`	`364`	`for (i=0;i<len;i++)`
`358`	`365`	`{`
`359`		`-if (buffer[i]=='\n'\|\|i==len-1)`
	`366`	`+if (buffer[i]=='\n')`
`360`	`367`	`{`
`361`	`368`	`intslen=&buffer[i]-linebegin+1;`
`362`	`369`	`char*linebuf=pg_malloc(slen+1);`

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!

Commit95ff5b3

File tree

1 file changed

1 file changed

`‎src/bin/pg_ctl/pg_ctl.c`

0 commit comments