Index: contrib/tablefunc/tablefunc.c
===================================================================
RCS file: /opt/src/cvs/pgsql-server/contrib/tablefunc/tablefunc.c,v
retrieving revision 1.7
diff -c -r1.7 tablefunc.c
*** contrib/tablefunc/tablefunc.c	5 Sep 2002 00:43:06 -0000	1.7
--- contrib/tablefunc/tablefunc.c	7 Sep 2002 16:28:50 -0000
***************
*** 801,806 ****
--- 801,810 ----
  		char		current_level[INT32_STRLEN];
  		char	   *current_branch;
  		char	  **values;
+ 		StringInfo	branchstr = NULL;
+ 
+ 		/* start a new branch */
+ 		branchstr = makeStringInfo();
  
  		if (show_branch)
  			values = (char **) palloc(CONNECTBY_NCOLS * sizeof(char *));
***************
*** 852,865 ****
  
  		for (i = 0; i < proc; i++)
  		{
! 			StringInfo	branchstr = NULL;
! 
! 			/* start a new branch */
! 			if (show_branch)
! 			{
! 				branchstr = makeStringInfo();
! 				appendStringInfo(branchstr, "%s", branch);
! 			}
  
  			/* get the next sql result tuple */
  			spi_tuple = tuptable->vals[i];
--- 856,863 ----
  
  		for (i = 0; i < proc; i++)
  		{
! 			/* initialize branch for this pass */
! 			appendStringInfo(branchstr, "%s", branch);
  
  			/* get the next sql result tuple */
  			spi_tuple = tuptable->vals[i];
***************
*** 868,884 ****
  			current_key = SPI_getvalue(spi_tuple, spi_tupdesc, 1);
  			current_key_parent = pstrdup(SPI_getvalue(spi_tuple, spi_tupdesc, 2));
  
  			/* get the current level */
  			sprintf(current_level, "%d", level);
  
  			/* extend the branch */
! 			if (show_branch)
! 			{
! 				appendStringInfo(branchstr, "%s%s", branch_delim, current_key);
! 				current_branch = branchstr->data;
! 			}
! 			else
! 				current_branch = NULL;
  
  			/* build a tuple */
  			values[0] = pstrdup(current_key);
--- 866,881 ----
  			current_key = SPI_getvalue(spi_tuple, spi_tupdesc, 1);
  			current_key_parent = pstrdup(SPI_getvalue(spi_tuple, spi_tupdesc, 2));
  
+ 			/* check to see if this key is also an ancestor */
+ 			if (strstr(branchstr->data, current_key))
+ 				elog(ERROR, "infinite recursion detected");
+ 
  			/* get the current level */
  			sprintf(current_level, "%d", level);
  
  			/* extend the branch */
! 			appendStringInfo(branchstr, "%s%s", branch_delim, current_key);
! 			current_branch = branchstr->data;
  
  			/* build a tuple */
  			values[0] = pstrdup(current_key);
***************
*** 916,921 ****
--- 913,922 ----
  													per_query_ctx,
  													attinmeta,
  													tupstore);
+ 
+ 			/* reset branch for next pass */
+ 			xpfree(branchstr->data);
+ 			initStringInfo(branchstr);
  		}
  	}