Fix some bogus direct uses of realloc().

tglsfdc · tglsfdc · commit 8824bae87b78 · 2014-11-18T13:28:13.000-05:00
pg_dump/parallel.c was using realloc() directly with no error check.
While the odds of an actual failure here seem pretty low, Coverity
complains about it, so fix by using pg_realloc() instead.

While looking for other instances, I noticed a couple of places in
psql that hadn't gotten the memo about the availability of pg_realloc.
These aren't bugs, since they did have error checks, but verbosely
inconsistent code is not a good thing.

Back-patch as far as 9.3.  9.2 did not have pg_dump/parallel.c, nor
did it have pg_realloc available in all frontend code.
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
@@ -1300,15 +1300,15 @@ readMessageFromPipe(int fd)
 		{
 			/* could be any number */
 			bufsize += 16;
-			msg = (char *) realloc(msg, bufsize);
+			msg = (char *) pg_realloc(msg, bufsize);
 		}
 	}
 
 	/*
 	 * Worker has closed the connection, make sure to clean up before return
 	 * since we are not returning msg (but did allocate it).
 	 */
-	free(msg);
+	pg_free(msg);
 
 	return NULL;
 }
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -1112,12 +1112,7 @@ exec_command(const char *cmd,
 			while ((opt = psql_scan_slash_option(scan_state,
 												 OT_NORMAL, NULL, false)))
 			{
-				newval = realloc(newval, strlen(newval) + strlen(opt) + 1);
-				if (!newval)
-				{
-					psql_error("out of memory\n");
-					exit(EXIT_FAILURE);
-				}
+				newval = pg_realloc(newval, strlen(newval) + strlen(opt) + 1);
 				strcat(newval, opt);
 				free(opt);
 			}
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
@@ -3820,13 +3820,8 @@ complete_from_variables(char *text, const char *prefix, const char *suffix)
 		if (nvars >= maxvars)
 		{
 			maxvars *= 2;
-			varnames = (char **) realloc(varnames,
-										 (maxvars + 1) * sizeof(char *));
-			if (!varnames)
-			{
-				psql_error("out of memory\n");
-				exit(EXIT_FAILURE);
-			}
+			varnames = (char **) pg_realloc(varnames,
+											(maxvars + 1) * sizeof(char *));
 		}
 
 		buffer = (char *) pg_malloc(strlen(ptr->name) + overhead);

Original file line number	Diff line number	Diff line change
`@@ -1300,15 +1300,15 @@ readMessageFromPipe(int fd)`
`1300`	`1300`	`{`
`1301`	`1301`	`/* could be any number */`
`1302`	`1302`	`bufsize += 16;`
`1303`		`- msg = (char *) realloc(msg, bufsize);`
	`1303`	`+ msg = (char *) pg_realloc(msg, bufsize);`
`1304`	`1304`	`}`
`1305`	`1305`	`}`
`1306`	`1306`
`1307`	`1307`	`/*`
`1308`	`1308`	`* Worker has closed the connection, make sure to clean up before return`
`1309`	`1309`	`* since we are not returning msg (but did allocate it).`
`1310`	`1310`	`*/`
`1311`		`- free(msg);`
	`1311`	`+ pg_free(msg);`
`1312`	`1312`
`1313`	`1313`	`return NULL;`
`1314`	`1314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1112,12 +1112,7 @@ exec_command(const char *cmd,`
`1112`	`1112`	`while ((opt = psql_scan_slash_option(scan_state,`
`1113`	`1113`	`OT_NORMAL, NULL, false)))`
`1114`	`1114`	`{`
`1115`		`- newval = realloc(newval, strlen(newval) + strlen(opt) + 1);`
`1116`		`- if (!newval)`
`1117`		`- {`
`1118`		`- psql_error("out of memory\n");`
`1119`		`- exit(EXIT_FAILURE);`
`1120`		`- }`
	`1115`	`+ newval = pg_realloc(newval, strlen(newval) + strlen(opt) + 1);`
`1121`	`1116`	`strcat(newval, opt);`
`1122`	`1117`	`free(opt);`
`1123`	`1118`	`}`