NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commiteb93316

committed

Fix issues with pg_ctl

The new, small, free_readfile managed to have bug in it which couldcause it to try and free something it shouldn't, and fix the casewhere it was being called with an invalid pointer leading to asegfault.Noted by Bruce, issues introduced and fixed by me.

1 parent6f37c08 commiteb93316Copy full SHA for eb93316

File tree

1 file changed

-5

lines changed

src/bin/pg_ctl
- pg_ctl.c

1 file changed

-5

lines changed

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

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -376,13 +376,14 @@ readfile(const char *path)`
`376`	`376`	`void`
`377`	`377`	`free_readfile(char**optlines)`
`378`	`378`	`{`
`379`		`-inti=0;`
	`379`	`+char*curr_line=NULL;`
	`380`	`+inti=0;`
`380`	`381`
`381`	`382`	`if (!optlines)`
`382`	`383`	`return;`
`383`	`384`
`384`		`-while (optlines[i++])`
`385`		`-free(optlines[i]);`
	`385`	`+while ((curr_line=optlines[i++]))`
	`386`	`+free(curr_line);`
`386`	`387`
`387`	`388`	`free(optlines);`
`388`	`389`
`@@ -1224,15 +1225,16 @@ do_status(void)`
`1224`	`1225`	`if (postmaster_is_alive((pid_t)pid))`
`1225`	`1226`	`{`
`1226`	`1227`	`char**optlines;`
	`1228`	`+char**curr_line;`
`1227`	`1229`
`1228`	`1230`	`printf(_("%s: server is running (PID: %ld)\n"),`
`1229`	`1231`	`progname,pid);`
`1230`	`1232`
`1231`	`1233`	`optlines=readfile(postopts_file);`
`1232`	`1234`	`if (optlines!=NULL)`
`1233`	`1235`	`{`
`1234`		`-for (;*optlines!=NULL;optlines++)`
`1235`		`-fputs(*optlines,stdout);`
	`1236`	`+for (curr_line=optlines;*curr_line!=NULL;curr_line++)`
	`1237`	`+fputs(*curr_line,stdout);`
`1236`	`1238`
`1237`	`1239`	`/* Free the results of readfile */`
`1238`	`1240`	`free_readfile(optlines);`

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!

Commiteb93316

File tree

1 file changed

1 file changed

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

0 commit comments