diff options
| -rw-r--r-- | src/bin/pg_dump/parallel.c | 4 | ||||
| -rw-r--r-- | src/bin/psql/command.c | 7 | ||||
| -rw-r--r-- | src/bin/psql/tab-complete.c | 9 |
3 files changed, 5 insertions, 15 deletions
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c index e50dd8b43f8..f5dbbbce716 100644 --- a/src/bin/pg_dump/parallel.c +++ b/src/bin/pg_dump/parallel.c @@ -1303,7 +1303,7 @@ readMessageFromPipe(int fd) { /* could be any number */ bufsize += 16; - msg = (char *) realloc(msg, bufsize); + msg = (char *) pg_realloc(msg, bufsize); } } @@ -1311,7 +1311,7 @@ readMessageFromPipe(int fd) * 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 index 6504959e358..9b7f241fd40 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -1130,12 +1130,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 index ca76856da9f..afb5e9962e0 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -3975,13 +3975,8 @@ complete_from_variables(const 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 *)); } varnames[nvars++] = psprintf("%s%s%s", prefix, ptr->name, suffix); |