NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitbb604d0

committed

Plug memory leak when reloading config file.

The absolute path to config file was not pfreed. There are probably moresmall leaks here and there in the config file reload code and assign hooks,and in practice no-one reloads the config files frequently enough for it tobe a problem, but this one is trivial enough that might as well fix it.Backpatch to 9.3 where the leak was introduced.

1 parentb0aa177 commitbb604d0Copy full SHA for bb604d0

File tree

1 file changed

-5

lines changed

src/backend/utils/misc
- guc-file.l

1 file changed

-5

lines changed

`‎src/backend/utils/misc/guc-file.l`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,7 @@ ParseConfigFile(const char config_file, const char calling_file, bool strict,`
`409`	`409`	`ConfigVariable **head_p,`
`410`	`410`	`ConfigVariable **tail_p)`
`411`	`411`	`{`
	`412`	`+char *abs_path;`
`412`	`413`	`boolOK =true;`
`413`	`414`	`FILE *fp;`
`414`	`415`
`@@ -426,28 +427,29 @@ ParseConfigFile(const char config_file, const char calling_file, bool strict,`
`426`	`427`	`returnfalse;`
`427`	`428`	`}`
`428`	`429`
`429`		`-config_file =AbsoluteConfigLocation(config_file,calling_file);`
`430`		`-fp =AllocateFile(config_file,"r");`
	`430`	`+abs_path =AbsoluteConfigLocation(config_file,calling_file);`
	`431`	`+fp =AllocateFile(abs_path,"r");`
`431`	`432`	`if (!fp)`
`432`	`433`	`{`
`433`	`434`	`if (strict)`
`434`	`435`	`{`
`435`	`436`	`ereport(elevel,`
`436`	`437`	`(errcode_for_file_access(),`
`437`	`438`	`errmsg("could not open configuration file\"%s\": %m",`
`438`		`-config_file)));`
	`439`	`+abs_path)));`
`439`	`440`	`returnfalse;`
`440`	`441`	`}`
`441`	`442`
`442`	`443`	`ereport(LOG,`
`443`	`444`	`(errmsg("skipping missing configuration file\"%s\"",`
`444`		`-config_file)));`
	`445`	`+abs_path)));`
`445`	`446`	`return OK;`
`446`	`447`	`}`
`447`	`448`
`448`		`-OK =ParseConfigFp(fp,config_file, depth, elevel, head_p, tail_p);`
	`449`	`+OK =ParseConfigFp(fp,abs_path, depth, elevel, head_p, tail_p);`
`449`	`450`
`450`	`451`	`FreeFile(fp);`
	`452`	`+pfree(abs_path);`
`451`	`453`
`452`	`454`	`return OK;`
`453`	`455`	`}`

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!

Commitbb604d0

File tree

1 file changed

1 file changed

`‎src/backend/utils/misc/guc-file.l`

0 commit comments