NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc47a558

committed

Ensure ParseTzFile() closes the input file after failing.

We hadn't noticed this because (a) few people feed invalidtimezone abbreviation files to the server, and (b) in typicalscenarios guc.c would throw ereport(ERROR) and then transactionabort handling would silently clean up the leaked file reference.However, it was possible to observe file leakage warnings if onebreaks an already-active abbreviation file, because guc.c doesnot throw ERROR when loading supposedly-validated settings duringsession start or SIGHUP processing.Report and fix by Kyotaro Horiguchi (cosmetic adjustments by me)Discussion:https://postgr.es/m/20220530.173740.748502979257582392.horikyota.ntt@gmail.com

1 parenta18b2a3 commitc47a558Copy full SHA for c47a558

File tree

1 file changed

+16

-7

lines changed

src/backend/utils/misc
- tzparser.c

1 file changed

+16

-7

lines changed

`‎src/backend/utils/misc/tzparser.c`

Lines changed: 16 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,8 @@ ParseTzFile(const char *filename, int depth,`
`364`	`364`	`{`
`365`	`365`	`GUC_check_errmsg("could not read time zone file \"%s\": %m",`
`366`	`366`	`filename);`
`367`		`-return-1;`
	`367`	`+n=-1;`
	`368`	`+break;`
`368`	`369`	`}`
`369`	`370`	`/* else we're at EOF after all */`
`370`	`371`	`break;`
`@@ -374,7 +375,8 @@ ParseTzFile(const char *filename, int depth,`
`374`	`375`	`/* the line is too long for tzbuf */`
`375`	`376`	`GUC_check_errmsg("line is too long in time zone file \"%s\", line %d",`
`376`	`377`	`filename,lineno);`
`377`		`-return-1;`
	`378`	`+n=-1;`
	`379`	`+break;`
`378`	`380`	`}`
`379`	`381`
`380`	`382`	`/* skip over whitespace */`
`@@ -397,12 +399,13 @@ ParseTzFile(const char *filename, int depth,`
`397`	`399`	`{`
`398`	`400`	`GUC_check_errmsg("@INCLUDE without file name in time zone file \"%s\", line %d",`
`399`	`401`	`filename,lineno);`
`400`		`-return-1;`
	`402`	`+n=-1;`
	`403`	`+break;`
`401`	`404`	`}`
`402`	`405`	`n=ParseTzFile(includeFile,depth+1,`
`403`	`406`	`base,arraysize,n);`
`404`	`407`	`if (n<0)`
`405`		`-return-1;`
	`408`	`+break;`
`406`	`409`	`continue;`
`407`	`410`	`}`
`408`	`411`
`@@ -413,12 +416,18 @@ ParseTzFile(const char *filename, int depth,`
`413`	`416`	`}`
`414`	`417`
`415`	`418`	`if (!splitTzLine(filename,lineno,line,&tzentry))`
`416`		`-return-1;`
	`419`	`+{`
	`420`	`+n=-1;`
	`421`	`+break;`
	`422`	`+}`
`417`	`423`	`if (!validateTzEntry(&tzentry))`
`418`		`-return-1;`
	`424`	`+{`
	`425`	`+n=-1;`
	`426`	`+break;`
	`427`	`+}`
`419`	`428`	`n=addToArray(base,arraysize,n,&tzentry,override);`
`420`	`429`	`if (n<0)`
`421`		`-return-1;`
	`430`	`+break;`
`422`	`431`	`}`
`423`	`432`
`424`	`433`	`FreeFile(tzFile);`

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!

Commitc47a558

File tree

1 file changed

1 file changed

`‎src/backend/utils/misc/tzparser.c`

0 commit comments