pg_dumpall failed on groups having no members. Per report from

tglsfdc · tglsfdc · commit 2a44306396f0 · 2003-03-14T22:45:49.000Z
Nick Eskelinen.
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.15 2003/03/06 21:45:52 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.16 2003/03/14 22:45:49 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -327,7 +327,7 @@ dumpGroups(PGconn *conn)
 
 		val = strdup(PQgetvalue(res, i, 2));
 		tok = strtok(val, ",{}");
-		do
+		while (tok)
 		{
 			PGresult   *res2;
 			PQExpBuffer buf2 = createPQExpBuffer();
@@ -347,7 +347,7 @@ dumpGroups(PGconn *conn)
 
 			tok = strtok(NULL, "{},");
 		}
-		while (tok);
+		free(val);
 
 		printf("%s", buf->data);
 		destroyPQExpBuffer(buf);

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`*`
`9`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.15 2003/03/06 21:45:52 tgl Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.16 2003/03/14 22:45:49 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -327,7 +327,7 @@ dumpGroups(PGconn *conn)`
`327`	`327`
`328`	`328`	`val = strdup(PQgetvalue(res, i, 2));`
`329`	`329`	`tok = strtok(val, ",{}");`
`330`		`- do`
	`330`	`+ while (tok)`
`331`	`331`	`{`
`332`	`332`	`PGresult *res2;`
`333`	`333`	`PQExpBuffer buf2 = createPQExpBuffer();`
`@@ -347,7 +347,7 @@ dumpGroups(PGconn *conn)`
`347`	`347`
`348`	`348`	`tok = strtok(NULL, "{},");`
`349`	`349`	`}`
`350`		`- while (tok);`
	`350`	`+ free(val);`
`351`	`351`
`352`	`352`	`printf("%s", buf->data);`
`353`	`353`	`destroyPQExpBuffer(buf);`