diff options
| author | Michael Paquier <michael@paquier.xyz> | 2024-09-19 16:25:07 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2024-09-19 16:25:07 +0900 |
| commit | b0ae6db2088bbd1d16733b359c9c300735e9c21e (patch) | |
| tree | 0750d102ee960ff53b674517c0a4746edc63d417 /src/bin/psql/common.c | |
| parent | 19b389c60871cd14b07dfb244a519d8cb83988cc (diff) | |
psql: Fix memory leak with repeated calls of \bind
Calling \bind repeatedly would cause the memory allocated for the list
of bind parameters to be leaked after each call, as the list is reset
when beginning a single call.
This issue is fixed by making the cleanup of the bind parameter list
more aggressive, refactoring it into a single routine called after
processing a query and before running an individual \bind.
HEAD required more surgery and has been fixed by 87eeadaea143. Issue
introduced by 5b66de3433e2.
Reported-by: Anthonin Bonnefoy
Discussion: https://postgr.es/m/2e5b89af-a351-ff0a-000c-037ac28314ab@gmail.com
Backpatch-through: 16
Diffstat (limited to 'src/bin/psql/common.c')
| -rw-r--r-- | src/bin/psql/common.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index fe8e049c4c1..4a50eb1e672 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -1275,14 +1275,7 @@ sendquery_cleanup: } /* clean up after \bind */ - if (pset.bind_flag) - { - for (i = 0; i < pset.bind_nparams; i++) - free(pset.bind_params[i]); - free(pset.bind_params); - pset.bind_params = NULL; - pset.bind_flag = false; - } + clean_bind_state(); /* reset \gset trigger */ if (pset.gset_prefix) @@ -2253,6 +2246,26 @@ uri_prefix_length(const char *connstr) } /* + * Reset state related to \bind + * + * Clean up any state related to bind parameters and bind_flag. This needs + * to be called after processing a query or when running \bind. + */ +void +clean_bind_state(void) +{ + if (pset.bind_flag) + { + for (int i = 0; i < pset.bind_nparams; i++) + free(pset.bind_params[i]); + free(pset.bind_params); + } + + pset.bind_params = NULL; + pset.bind_flag = false; +} + +/* * Recognized connection string either starts with a valid URI prefix or * contains a "=" in it. * |