Commitf459099

committed

The attached patch fixes 2 memory leaks in pg_dump, as well as corrects

a spelling mistake and deletes an antiquated comment.Neil Conway

1 parent43b0f2e commitf459099Copy full SHA for f459099

File tree

+14

-10

lines changed

+14

-10

lines changed

Lines changed: 2 additions & 2 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.49 2002/05/29 01:49:57 tgl Exp $`
	`18`	`+ *$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.50 2002/07/02 05:49:51 momjian Exp $`
`19`	`19`	`*`
`20`	`20`	`* Modifications - 28-Jun-2000 - pjw@rhyme.com.au`
`21`	`21`	`*`
`@@ -2371,7 +2371,7 @@ _SortToc(ArchiveHandle *AH, TocSortCompareFn fn)`
`2371`	`2371`	`/* Sort it, but ignore the header entries */`
`2372`	`2372`	`qsort(&(tea[1]),AH->tocCount,sizeof(TocEntry*),fn);`
`2373`	`2373`
`2374`		`-/* Rebuild list: this worksbecuase we have headers at each end */`
	`2374`	`+/* Rebuild list: this worksbecause we have headers at each end */`
`2375`	`2375`	`for (i=1;i <=AH->tocCount;i++)`
`2376`	`2376`	`{`
`2377`	`2377`	`tea[i]->next=tea[i+1];`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`*`
`24`	`24`	`* IDENTIFICATION`
`25`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.267 2002/06/20 20:29:41 momjian Exp $`
	`25`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.268 2002/07/02 05:49:51 momjian Exp $`
`26`	`26`	`*`
`27`	`27`	`*-------------------------------------------------------------------------`
`28`	`28`	`*/`
`@@ -967,10 +967,10 @@ dumpClasses_nodumpData(Archive fout, char oid, void *dctxv)`
`967`	`967`	`write_msg(NULL,"SQL command to dump the contents of table \"%s\" failed: PQendcopy() failed.\n",classname);`
`968`	`968`	`write_msg(NULL,"Error message from server: %s",PQerrorMessage(g_conn));`
`969`	`969`	`write_msg(NULL,"The command was: %s\n",q->data);`
`970`		`-PQclear(res);`
`971`	`970`	`exit_nicely();`
`972`	`971`	`}`
`973`	`972`
	`973`	`+PQclear(res);`
`974`	`974`	`destroyPQExpBuffer(q);`
`975`	`975`	`return1;`
`976`	`976`	`}`
`@@ -4758,6 +4758,15 @@ dumpOneTable(Archive fout, TableInfo tbinfo, TableInfo *g_tblinfo)`
`4758`	`4758`	`/* Dump Table Comments */`
`4759`	`4759`	`dumpTableComment(fout,tbinfo,reltypename,commentDeps);`
`4760`	`4760`
	`4761`	`+if (commentDeps)`
	`4762`	`+{`
	`4763`	`+for (j=0; (*commentDeps)[j]!=NULL;j++)`
	`4764`	`+{`
	`4765`	`+free((void) (commentDeps)[j]);`
	`4766`	`+}`
	`4767`	`+free(commentDeps);`
	`4768`	`+}`
	`4769`	`+`
`4761`	`4770`	`destroyPQExpBuffer(query);`
`4762`	`4771`	`destroyPQExpBuffer(q);`
`4763`	`4772`	`destroyPQExpBuffer(delq);`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: pg_dump.h,v 1.88 2002/06/20 20:29:41 momjian Exp $`
	`9`	`+ * $Id: pg_dump.h,v 1.89 2002/07/02 05:49:52 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -156,11 +156,6 @@ extern char g_comment_end[10];`
`156`	`156`
`157`	`157`	`externcharg_opaque_type[10];/* name for the opaque type */`
`158`	`158`
`159`		`-/* pg_dump is really two programs in one`
`160`		`-one version works with postgres v4r2`
`161`		`-and the other works with postgreSQL`
`162`		`-the common routines are declared here`
`163`		`-*/`
`164`	`159`	`/*`
`165`	`160`	`*common utility functions`
`166`	`161`	`*/`

Comments

(0)