Commit4b833d0

committed

Prevent core dump when die_horribly() is called with null AH pointer.

Problem reported and fixed by Oliver Elphick.

1 parent4dc2bce commit4b833d0Copy full SHA for 4b833d0

File tree

-6

lines changed

-6

lines changed

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- *$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.65 2003/01/13 04:28:55 inoue Exp $`
	`18`	`+ *$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.66 2003/01/27 00:23:38 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -1379,14 +1379,15 @@ static void`
`1379`	`1379`	`_die_horribly(ArchiveHandleAH,constcharmodulename,constchar*fmt,va_listap)`
`1380`	`1380`	`{`
`1381`	`1381`	`_write_msg(modulename,fmt,ap);`
`1382`		`-if (AH->public.verbose)`
`1383`		`-write_msg(NULL,"*** aborted because of error\n");`
`1384`	`1382`
`1385`		`-if (AH)`
	`1383`	`+if (AH) {`
	`1384`	`+if (AH->public.verbose)`
	`1385`	`+write_msg(NULL,"*** aborted because of error\n");`
`1386`	`1386`	`if (AH->connection)`
`1387`	`1387`	`PQfinish(AH->connection);`
`1388`		`-if (AH->blobConnection)`
`1389`		`-PQfinish(AH->blobConnection);`
	`1388`	`+if (AH->blobConnection)`
	`1389`	`+PQfinish(AH->blobConnection);`
	`1390`	`+}`
`1390`	`1391`
`1391`	`1392`	`exit(1);`
`1392`	`1393`	`}`

Comments

(0)