Avoid malloc(0). Although standard mallocs seem not to object,

tglsfdc · tglsfdc · commit 635d00ecea11 · 2003-08-08T19:19:32.000Z
some debugging malloc packages do.
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.65 2003/08/04 00:43:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.66 2003/08/08 19:19:32 tgl Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -1663,20 +1663,25 @@ plpgsql_add_initdatums(int **varnos)
 
 	if (varnos != NULL)
 	{
-		*varnos = (int *) malloc(sizeof(int) * n);
-
-		n = 0;
-		for (i = datums_last; i < plpgsql_nDatums; i++)
+		if (n > 0)
 		{
-			switch (plpgsql_Datums[i]->dtype)
+			*varnos = (int *) malloc(sizeof(int) * n);
+
+			n = 0;
+			for (i = datums_last; i < plpgsql_nDatums; i++)
 			{
-				case PLPGSQL_DTYPE_VAR:
-					(*varnos)[n++] = plpgsql_Datums[i]->dno;
+				switch (plpgsql_Datums[i]->dtype)
+				{
+					case PLPGSQL_DTYPE_VAR:
+						(*varnos)[n++] = plpgsql_Datums[i]->dno;
 
-				default:
-					break;
+					default:
+						break;
+				}
 			}
 		}
+		else
+			*varnos = NULL;
 	}
 
 	datums_last = plpgsql_nDatums;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* procedural language`
`4`	`4`	`*`
`5`	`5`	`* IDENTIFICATION`
`6`		`- * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.65 2003/08/04 00:43:33 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.66 2003/08/08 19:19:32 tgl Exp $`
`7`	`7`	`*`
`8`	`8`	`* This software is copyrighted by Jan Wieck - Hamburg.`
`9`	`9`	`*`
`@@ -1663,20 +1663,25 @@ plpgsql_add_initdatums(int **varnos)`
`1663`	`1663`
`1664`	`1664`	`if (varnos != NULL)`
`1665`	`1665`	`{`
`1666`		`- varnos = (int ) malloc(sizeof(int) * n);`
`1667`		`-`
`1668`		`- n = 0;`
`1669`		`- for (i = datums_last; i < plpgsql_nDatums; i++)`
	`1666`	`+ if (n > 0)`
`1670`	`1667`	`{`
`1671`		`- switch (plpgsql_Datums[i]->dtype)`
	`1668`	`+ varnos = (int ) malloc(sizeof(int) * n);`
	`1669`	`+`
	`1670`	`+ n = 0;`
	`1671`	`+ for (i = datums_last; i < plpgsql_nDatums; i++)`
`1672`	`1672`	`{`
`1673`		`- case PLPGSQL_DTYPE_VAR:`
`1674`		`- (*varnos)[n++] = plpgsql_Datums[i]->dno;`
	`1673`	`+ switch (plpgsql_Datums[i]->dtype)`
	`1674`	`+ {`
	`1675`	`+ case PLPGSQL_DTYPE_VAR:`
	`1676`	`+ (*varnos)[n++] = plpgsql_Datums[i]->dno;`
`1675`	`1677`
`1676`		`- default:`
`1677`		`- break;`
	`1678`	`+ default:`
	`1679`	`+ break;`
	`1680`	`+ }`
`1678`	`1681`	`}`
`1679`	`1682`	`}`
	`1683`	`+ else`
	`1684`	`+ *varnos = NULL;`
`1680`	`1685`	`}`
`1681`	`1686`
`1682`	`1687`	`datums_last = plpgsql_nDatums;`