Commit6910032

Neil Conway

committed

Upon closer inspection, Greg's psql tab completion patch leaks memory.

Fix the leak, and add a comment to note that the return value ofprevious_word must be free'd.

1 parent4c1f9a0 commit6910032Copy full SHA for 6910032

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.128 2005/05/1804:47:40 neilc Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.129 2005/05/1805:01:10 neilc Exp $`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`/*----------------------------------------------------------------------`
`@@ -1802,6 +1802,7 @@ psql_completion(char *text, int start, int end)`
`1802`	`1802`	`free(prev2_wd);`
`1803`	`1803`	`free(prev3_wd);`
`1804`	`1804`	`free(prev4_wd);`
	`1805`	`+free(prev5_wd);`
`1805`	`1806`
`1806`	`1807`	`/* Return our Grand List O' Matches */`
`1807`	`1808`	`returnmatches;`
`@@ -2168,9 +2169,11 @@ exec_query(const char *query)`
`2168`	`2169`
`2169`	`2170`
`2170`	`2171`
`2171`		`-/* Return the word (space delimited) before point. Set skip > 0 to skip that`
`2172`		`- many words; e.g. skip=1 finds the word before the previous one.`
`2173`		`-*/`
	`2172`	`+/*`
	`2173`	`+ * Return the word (space delimited) before point. Set skip > 0 to`
	`2174`	`+ * skip that many words; e.g. skip=1 finds the word before the`
	`2175`	`+ * previous one. Return value is NULL or a malloc'ed string.`
	`2176`	`+ */`
`2174`	`2177`	`staticchar*`
`2175`	`2178`	`previous_word(intpoint,intskip)`
`2176`	`2179`	`{`

Comments

(0)