diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 080ce641d93..a5a77af074e 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -5159,6 +5159,10 @@ _complete_from_query(const char *simple_query,
 
 		/* Clean up */
 		termPQExpBuffer(&query_buffer);
+		if (schemaname)
+			free(schemaname);
+		if (objectname)
+			free(objectname);
 		free(e_object_like);
 		if (e_schemaname)
 			free(e_schemaname);
diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c
index c3ea4fc1860..f311bdd3ad5 100644
--- a/src/fe_utils/string_utils.c
+++ b/src/fe_utils/string_utils.c
@@ -1227,4 +1227,7 @@ patternToSQLRegex(int encoding, PQExpBuffer dbnamebuf, PQExpBuffer schemabuf,
 			appendPQExpBufferStr(dbnamebuf, curbuf->data);
 		termPQExpBuffer(curbuf);
 	}
+
+	if (want_literal_dbname)
+		termPQExpBuffer(&left_literal);
 }