database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Improve failure detection with array parsing in pg_dump

Browse Source 
Similarly to 3636efa, the checks done in pg_dump when parsing array
values from catalogs have been too lax.  Under memory pressure, it could
be possible, though very unlikely, to finish with dumps that miss some
data like:
- Statistics for indexes
- Run-time configuration of functions
- Configuration of extensions
- Publication list for a subscription

No backpatch is done as this is not going to be a problem in practice.
For example, if an OOM causes an array parsing to fail, a follow-up code
path of pg_dump would most likely complain with an allocation failure
due to the memory pressure.

Author: Michael Paquier
Reviewed-by: Daniel Gustafsson
Discussion: https://postgr.es/m/20201111061319.GE2276@paquier.xyz
This commit is contained in:
Michael Paquier
2020-11-19 10:36:08 +09:00
parent 27838981be
commit 13b58f8934
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/bin/pg_dump/pg_dump.c
View File

@ -4357,13 +4357,7 @@ dumpSubscription(Archive *fout, SubscriptionInfo *subinfo)
/* Build list of quoted publications and append them to query. */ /* Build list of quoted publications and append them to query. */
if (!parsePGArray(subinfo->subpublications, &pubnames, &npubnames)) if (!parsePGArray(subinfo->subpublications, &pubnames, &npubnames))
{ fatal("could not parse subpublications array");
pg_log_warning("could not parse subpublications array");
if (pubnames)
free(pubnames);
pubnames = NULL;
npubnames = 0;
}
publications = createPQExpBuffer(); publications = createPQExpBuffer();
for (i = 0; i < npubnames; i++) for (i = 0; i < npubnames; i++)
@ -12128,13 +12122,12 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
if (proconfig && *proconfig) if (proconfig && *proconfig)
{ {
if (!parsePGArray(proconfig, &configitems, &nconfigitems)) if (!parsePGArray(proconfig, &configitems, &nconfigitems))
{ fatal("could not parse proconfig array");
pg_log_warning("could not parse proconfig array"); }
if (configitems) else
free(configitems); {
configitems = NULL; configitems = NULL;
nconfigitems = 0; nconfigitems = 0;
}
} }
if (funcargs) if (funcargs)
@ -16453,8 +16446,8 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
char *indstatvals = indxinfo->indstatvals; char *indstatvals = indxinfo->indstatvals;
char **indstatcolsarray = NULL; char **indstatcolsarray = NULL;
char **indstatvalsarray = NULL; char **indstatvalsarray = NULL;
int nstatcols; int nstatcols = 0;
int nstatvals; int nstatvals = 0;
if (dopt->binary_upgrade) if (dopt->binary_upgrade)
binary_upgrade_set_pg_class_oids(fout, q, binary_upgrade_set_pg_class_oids(fout, q,
@ -16483,12 +16476,17 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
* If the index has any statistics on some of its columns, generate * If the index has any statistics on some of its columns, generate
* the associated ALTER INDEX queries. * the associated ALTER INDEX queries.
*/ */
if (parsePGArray(indstatcols, &indstatcolsarray, &nstatcols) && if (strlen(indstatcols) != 0 || strlen(indstatvals) != 0)
parsePGArray(indstatvals, &indstatvalsarray, &nstatvals) &&
nstatcols == nstatvals)
{ {
int j; int j;
if (!parsePGArray(indstatcols, &indstatcolsarray, &nstatcols))
fatal("could not parse index statistic columns");
if (!parsePGArray(indstatvals, &indstatvalsarray, &nstatvals))
fatal("could not parse index statistic values");
if (nstatcols != nstatvals)
fatal("mismatched number of columns and values for index stats");
for (j = 0; j < nstatcols; j++) for (j = 0; j < nstatcols; j++)
{ {
appendPQExpBuffer(q, "ALTER INDEX %s ", qqindxname); appendPQExpBuffer(q, "ALTER INDEX %s ", qqindxname);
@ -17938,15 +17936,20 @@ processExtensionTables(Archive *fout, ExtensionInfo extinfo[],
char *extcondition = curext->extcondition; char *extcondition = curext->extcondition;
char **extconfigarray = NULL; char **extconfigarray = NULL;
char **extconditionarray = NULL; char **extconditionarray = NULL;
int nconfigitems; int nconfigitems = 0;
int nconditionitems; int nconditionitems = 0;
if (parsePGArray(extconfig, &extconfigarray, &nconfigitems) && if (strlen(extconfig) != 0 || strlen(extcondition) != 0)
parsePGArray(extcondition, &extconditionarray, &nconditionitems) &&
nconfigitems == nconditionitems)
{ {
int j; int j;
if (!parsePGArray(extconfig, &extconfigarray, &nconfigitems))
fatal("could not parse extension configuration array");
if (!parsePGArray(extcondition, &extconditionarray, &nconditionitems))
fatal("could not parse extension condition array");
if (nconfigitems != nconditionitems)
fatal("mismatched number of configurations and conditions for extension");
for (j = 0; j < nconfigitems; j++) for (j = 0; j < nconfigitems; j++)
{ {
TableInfo *configtbl; TableInfo *configtbl;