NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd37e0d0

committed

Release PQconninfoOptions array in GetDbnameFromConnectionOptions().

It wasn't getting freed in one code path, which Coverity identified asa resource leak. It's probably of little consequence, but re-orderingthe code into the correct sequence is no more work than dismissing thecomplaint. Minor oversight in commita145f42.While here, improve the unreasonably clunky coding ofFindDbnameInConnParams: use of an output parameter is unnecessaryand prone to uninitialized-variable problems.

1 parent225e1dd commitd37e0d0Copy full SHA for d37e0d0

File tree

1 file changed

+14

-15

lines changed

src/bin/pg_basebackup
- streamutil.c

1 file changed

+14

-15

lines changed

`‎src/bin/pg_basebackup/streamutil.c`

Lines changed: 14 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`intWalSegSz;`
`35`	`35`
`36`	`36`	`staticboolRetrieveDataDirCreatePerm(PGconn*conn);`
`37`		`-staticvoidFindDbnameInConnParams(PQconninfoOptionconn_opts,char*dbname);`
	`37`	`+staticcharFindDbnameInConnParams(PQconninfoOptionconn_opts);`
`38`	`38`
`39`	`39`	`/* SHOW command for replication connection was introduced in version 10 */`
`40`	`40`	`#defineMINIMUM_VERSION_FOR_SHOW_CMD 100000`
`@@ -272,21 +272,21 @@ GetConnection(void)`
`272`	`272`	`* FindDbnameInConnParams`
`273`	`273`	`*`
`274`	`274`	`* This is a helper function for GetDbnameFromConnectionOptions(). Extract`
`275`		`- * the value of dbname from PQconninfoOption parameters.`
	`275`	`+ * the value of dbname from PQconninfoOption parameters, if it's present.`
	`276`	`+ * Returns a strdup'd result or NULL.`
`276`	`277`	`*/`
`277`		`-staticvoid`
`278`		`-FindDbnameInConnParams(PQconninfoOptionconn_opts,char*dbname)`
	`278`	`+staticchar*`
	`279`	`+FindDbnameInConnParams(PQconninfoOption*conn_opts)`
`279`	`280`	`{`
`280`	`281`	`PQconninfoOption*conn_opt;`
`281`	`282`
`282`		`-Assert(dbname!=NULL);`
`283`		`-`
`284`	`283`	`for (conn_opt=conn_opts;conn_opt->keyword!=NULL;conn_opt++)`
`285`	`284`	`{`
`286`		`-if ((strcmp(conn_opt->keyword,"dbname")==0)&&`
	`285`	`+if (strcmp(conn_opt->keyword,"dbname")==0&&`
`287`	`286`	`conn_opt->val!=NULL&&conn_opt->val[0]!='\0')`
`288`		`-*dbname=pg_strdup(conn_opt->val);`
	`287`	`+returnpg_strdup(conn_opt->val);`
`289`	`288`	`}`
	`289`	`+returnNULL;`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`/*`
`@@ -304,9 +304,9 @@ FindDbnameInConnParams(PQconninfoOption conn_opts, char *dbname)`
`304`	`304`	`char*`
`305`	`305`	`GetDbnameFromConnectionOptions(void)`
`306`	`306`	`{`
`307`		`-PQconninfoOption*conn_opts=NULL;`
	`307`	`+PQconninfoOption*conn_opts;`
`308`	`308`	`char*err_msg=NULL;`
`309`		`-char*dbname=NULL;`
	`309`	`+char*dbname;`
`310`	`310`
`311`	`311`	`/* First try to get the dbname from connection string. */`
`312`	`312`	`if (connection_string)`
`@@ -315,12 +315,11 @@ GetDbnameFromConnectionOptions(void)`
`315`	`315`	`if (conn_opts==NULL)`
`316`	`316`	`pg_fatal("%s",err_msg);`
`317`	`317`
`318`		`-FindDbnameInConnParams(conn_opts,&dbname);`
	`318`	`+dbname=FindDbnameInConnParams(conn_opts);`
	`319`	`+`
	`320`	`+PQconninfoFree(conn_opts);`
`319`	`321`	`if (dbname)`
`320`		`-{`
`321`		`-PQconninfoFree(conn_opts);`
`322`	`322`	`returndbname;`
`323`		`-}`
`324`	`323`	`}`
`325`	`324`
`326`	`325`	`/*`
`@@ -331,7 +330,7 @@ GetDbnameFromConnectionOptions(void)`
`331`	`330`	`if (conn_opts==NULL)`
`332`	`331`	`pg_fatal("out of memory");`
`333`	`332`
`334`		`-FindDbnameInConnParams(conn_opts,&dbname);`
	`333`	`+dbname=FindDbnameInConnParams(conn_opts);`
`335`	`334`
`336`	`335`	`PQconninfoFree(conn_opts);`
`337`	`336`	`returndbname;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd37e0d0

File tree

1 file changed

1 file changed

`‎src/bin/pg_basebackup/streamutil.c`

0 commit comments