[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.21.2.3,1.21.2.4

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv17527/lib

Modified Files:
      Tag: release-1_2-branch
	stdlib.php 
Log Message:
Fix SF bug #418267.

Deeply nested lists resulted in a "Stack bounds exceeded in
SetHTMLOutputMode" fatal error.  Now we just clamp the nesting
depth to 10 (eleven leading '*'s are treated as if there were
only ten of them.)



Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -C2 -r1.21.2.3 -r1.21.2.4
*** stdlib.php	2001/03/02 21:26:03	1.21.2.3
--- stdlib.php	2001/08/18 01:30:56	1.21.2.4
***************
*** 183,187 ****
        if ($level > 10) {
  	  // arbitrarily limit tag nesting
! 	  ExitWiki(gettext ("Nesting depth exceeded in SetHTMLOutputMode"));
        }
        
--- 183,190 ----
        if ($level > 10) {
  	  // arbitrarily limit tag nesting
! 	  //ExitWiki(gettext ("Nesting depth exceeded in SetHTMLOutputMode"));
! 	  // Now, instead of crapping out when we encounter a deeply
! 	  // nested list item, we just clamp the the maximum depth.
! 	  $level = 10;
        }