1010 *
1111 *
1212 * IDENTIFICATION
13- * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.129 2004/08/29 05:06:43 momjian Exp $
13+ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.130 2004/09/18 01:22:58 tgl Exp $
1414 *
1515 *-------------------------------------------------------------------------
1616 */
@@ -213,6 +213,9 @@ next_token(FILE *fp, char *buf, int bufsz)
213213 * Tokenize file and handle file inclusion and comma lists. We have
214214 * to breakapart thecommastoexpandany file names then
215215 * reconstruct with commas.
216+ *
217+ * The result is always a palloc'd string. If it's zero-length then
218+ * we have reached EOL.
216219 */
217220static char *
218221next_token_expand (FILE * file )
@@ -225,7 +228,7 @@ next_token_expand(FILE *file)
225228do
226229{
227230next_token (file ,buf ,sizeof (buf ));
228- if (!* buf )
231+ if (!buf [ 0 ] )
229232break ;
230233
231234if (buf [strlen (buf )- 1 ]== ',' )
@@ -382,7 +385,7 @@ tokenize_file(FILE *file, List **lines, List **line_nums)
382385buf = next_token_expand (file );
383386
384387/* add token to list, unless we are at EOL or comment start */
385- if (buf [0 ]!= '\0' )
388+ if (buf [0 ])
386389{
387390if (current_line == NIL )
388391{
@@ -403,6 +406,8 @@ tokenize_file(FILE *file, List **lines, List **line_nums)
403406current_line = NIL ;
404407/* Advance line number whenever we reach EOL */
405408line_number ++ ;
409+ /* Don't forget to pfree the next_token_expand result */
410+ pfree (buf );
406411}
407412}
408413}