NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite03c6d9

committed

Fix pg_file_write() error handling.

Detect fclose() failures; given "ln -s /dev/full $PGDATA/devfull","pg_file_write('devfull', 'x', true)" now fails as it should. Don'tleak a stream when fwrite() fails. Remove a born-ineffective test thataimed to skip zero-length writes. Back-patch to 9.2 (all supportedversions).

1 parentf6cfc14 commite03c6d9Copy full SHA for e03c6d9

File tree

1 file changed

-12

lines changed

contrib/adminpack
- adminpack.c

1 file changed

-12

lines changed

`‎contrib/adminpack/adminpack.c`

Lines changed: 7 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,27 +141,22 @@ pg_file_write(PG_FUNCTION_ARGS)`
`141`	`141`	`(ERRCODE_DUPLICATE_FILE,`
`142`	`142`	`errmsg("file \"%s\" exists",filename)));`
`143`	`143`
`144`		`-f=fopen(filename,"wb");`
	`144`	`+f=AllocateFile(filename,"wb");`
`145`	`145`	`}`
`146`	`146`	`else`
`147`		`-f=fopen(filename,"ab");`
	`147`	`+f=AllocateFile(filename,"ab");`
`148`	`148`
`149`	`149`	`if (!f)`
`150`	`150`	`ereport(ERROR,`
`151`	`151`	`(errcode_for_file_access(),`
`152`	`152`	`errmsg("could not open file \"%s\" for writing: %m",`
`153`	`153`	`filename)));`
`154`	`154`
`155`		`-if (VARSIZE(data)!=0)`
`156`		`-{`
`157`		`-count=fwrite(VARDATA(data),1,VARSIZE(data)-VARHDRSZ,f);`
`158`		`-`
`159`		`-if (count!=VARSIZE(data)-VARHDRSZ)`
`160`		`-ereport(ERROR,`
`161`		`-(errcode_for_file_access(),`
`162`		`-errmsg("could not write file \"%s\": %m",filename)));`
`163`		`-}`
`164`		`-fclose(f);`
	`155`	`+count=fwrite(VARDATA(data),1,VARSIZE(data)-VARHDRSZ,f);`
	`156`	`+if (count!=VARSIZE(data)-VARHDRSZ\|\|FreeFile(f))`
	`157`	`+ereport(ERROR,`
	`158`	`+(errcode_for_file_access(),`
	`159`	`+errmsg("could not write file \"%s\": %m",filename)));`
`165`	`160`
`166`	`161`	`PG_RETURN_INT64(count);`
`167`	`162`	`}`

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!

Commite03c6d9

File tree

1 file changed

1 file changed

`‎contrib/adminpack/adminpack.c`

0 commit comments