diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 92207d2e16..5f06768085 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -5158,6 +5158,8 @@ _complete_from_query(const char *simple_query,
 
 		/* Clean up */
 		termPQExpBuffer(&query_buffer);
+		free(schemaname);
+		free(objectname);
 		free(e_object_like);
 		free(e_schemaname);
 		free(e_ref_object);
diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c
index f9ea08705a..a2fa7a0c26 100644
--- a/src/fe_utils/string_utils.c
+++ b/src/fe_utils/string_utils.c
@@ -1225,4 +1225,7 @@ patternToSQLRegex(int encoding, PQExpBuffer dbnamebuf, PQExpBuffer schemabuf,
 			appendPQExpBufferStr(dbnamebuf, curbuf->data);
 		termPQExpBuffer(curbuf);
 	}
+
+	if (want_literal_dbname)
+		termPQExpBuffer(&left_literal);
 }