mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix very minor memory leaks in psql's command.c.

Browse Source 
\drds leaked its second pattern argument if any, and \connect leaked
any empty-string or "-" arguments.  These are old bugs, but it's hard
to imagine any real use-case where the leaks could amount to anything
meaningful, so not bothering with a back-patch.

Daniel Gustafsson and Tom Lane

Discussion: https://postgr.es/m/3641F19B-336A-431A-86CE-A80562505C5E@yesql.se
This commit is contained in:
Tom Lane 2017-07-27 11:10:38 -04:00
parent efd7f8e365
commit dc4da3dc84
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/psql/command.c
View File

@ -806,6 +806,9 @@ exec_command_d(PsqlScanState scan_state, bool active_branch, const char *cmd)
pattern2 = psql_scan_slash_option(scan_state, pattern2 = psql_scan_slash_option(scan_state,
OT_NORMAL, NULL, true); OT_NORMAL, NULL, true);
success = listDbRoleSettings(pattern, pattern2); success = listDbRoleSettings(pattern, pattern2);
if (pattern2)
free(pattern2);
} }
else else
status = PSQL_CMD_UNKNOWN; status = PSQL_CMD_UNKNOWN;
@ -2725,6 +2728,8 @@ exec_command_slash_command_help(PsqlScanState scan_state, bool active_branch)
/* /*
* Read and interpret an argument to the \connect slash command. * Read and interpret an argument to the \connect slash command.
*
* Returns a malloc'd string, or NULL if no/empty argument.
*/ */
static char * static char *
read_connect_arg(PsqlScanState scan_state) read_connect_arg(PsqlScanState scan_state)
@ -2750,7 +2755,10 @@ read_connect_arg(PsqlScanState scan_state)
return result; return result;
if (*result == '\0' || strcmp(result, "-") == 0) if (*result == '\0' || strcmp(result, "-") == 0)
{
free(result);
return NULL; return NULL;
}
return result; return result;
} }