database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-01 14:21:49 +03:00
Code

Promote pg_dumpall shell/connstr quoting functions to src/fe_utils.

Browse Source 
Rename these newly-extern functions with terms more typical of their new
neighbors.  No functional changes; a subsequent commit will use them in
more places.  Back-patch to 9.1 (all supported versions).  Back branches
lack src/fe_utils, so instead rename the functions in place; the
subsequent commit will copy them into the other programs using them.

Security: CVE-2016-5424
This commit is contained in:
Noah Misch 2016-08-08 10:07:46 -04:00
parent 18392ed4aa
commit 6df8ff49d9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bin/pg_dump/pg_dumpall.c
View File

@ -49,8 +49,8 @@ static void makeAlterConfigCommand(PGconn *conn, const char *arrayitem,
const char *name2); const char *name2);
static void dumpDatabases(PGconn *conn); static void dumpDatabases(PGconn *conn);
static void dumpTimestamp(char *msg); static void dumpTimestamp(char *msg);
static void doShellQuoting(PQExpBuffer buf, const char *str); static void appendShellString(PQExpBuffer buf, const char *str);
static void doConnStrQuoting(PQExpBuffer buf, const char *str); static void appendConnStrVal(PQExpBuffer buf, const char *str);
static int runPgDump(const char *dbname); static int runPgDump(const char *dbname);
static void buildShSecLabels(PGconn *conn, const char *catalog_name, static void buildShSecLabels(PGconn *conn, const char *catalog_name,
@ -215,7 +215,7 @@ main(int argc, char *argv[])
case 'f': case 'f':
filename = pg_strdup(optarg); filename = pg_strdup(optarg);
appendPQExpBufferStr(pgdumpopts, " -f "); appendPQExpBufferStr(pgdumpopts, " -f ");
doShellQuoting(pgdumpopts, filename); appendShellString(pgdumpopts, filename);
break; break;
case 'g': case 'g':
@ -256,7 +256,7 @@ main(int argc, char *argv[])
case 'S': case 'S':
appendPQExpBufferStr(pgdumpopts, " -S "); appendPQExpBufferStr(pgdumpopts, " -S ");
doShellQuoting(pgdumpopts, optarg); appendShellString(pgdumpopts, optarg);
break; break;
case 't': case 't':
@ -292,13 +292,13 @@ main(int argc, char *argv[])
case 2: case 2:
appendPQExpBufferStr(pgdumpopts, " --lock-wait-timeout "); appendPQExpBufferStr(pgdumpopts, " --lock-wait-timeout ");
doShellQuoting(pgdumpopts, optarg); appendShellString(pgdumpopts, optarg);
break; break;
case 3: case 3:
use_role = pg_strdup(optarg); use_role = pg_strdup(optarg);
appendPQExpBufferStr(pgdumpopts, " --role "); appendPQExpBufferStr(pgdumpopts, " --role ");
doShellQuoting(pgdumpopts, use_role); appendShellString(pgdumpopts, use_role);
break; break;
default: default:
@ -1713,9 +1713,9 @@ runPgDump(const char *dbname)
* string. * string.
*/ */
appendPQExpBuffer(connstrbuf, "%s dbname=", connstr); appendPQExpBuffer(connstrbuf, "%s dbname=", connstr);
doConnStrQuoting(connstrbuf, dbname); appendConnStrVal(connstrbuf, dbname);
doShellQuoting(cmd, connstrbuf->data); appendShellString(cmd, connstrbuf->data);
if (verbose) if (verbose)
fprintf(stderr, _("%s: running \"%s\"\n"), progname, cmd->data); fprintf(stderr, _("%s: running \"%s\"\n"), progname, cmd->data);
@ -1995,7 +1995,7 @@ constructConnStr(const char **keywords, const char **values)
appendPQExpBufferChar(buf, ' '); appendPQExpBufferChar(buf, ' ');
firstkeyword = false; firstkeyword = false;
appendPQExpBuffer(buf, "%s=", keywords[i]); appendPQExpBuffer(buf, "%s=", keywords[i]);
doConnStrQuoting(buf, values[i]); appendConnStrVal(buf, values[i]);
} }
connstr = pg_strdup(buf->data); connstr = pg_strdup(buf->data);
@ -2088,7 +2088,7 @@ dumpTimestamp(char *msg)
* string * string
*/ */
static void static void
doConnStrQuoting(PQExpBuffer buf, const char *str) appendConnStrVal(PQExpBuffer buf, const char *str)
{ {
const char *s; const char *s;
bool needquotes; bool needquotes;
@ -2137,7 +2137,7 @@ doConnStrQuoting(PQExpBuffer buf, const char *str)
* there eventually leads to errors here. * there eventually leads to errors here.
*/ */
static void static void
doShellQuoting(PQExpBuffer buf, const char *str) appendShellString(PQExpBuffer buf, const char *str)
{ {
const char *p; const char *p;