X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/46c33b38324e9e71a9126f1aabd5e73e3358b22b..609f48c93cc9017031c11da942a00975c3e7656a:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index f38669728..d7f07c08a 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -84,6 +84,7 @@ sub parentlinks ($) { #{{{
 	return @ret;
 } #}}}
 
+my %preprocessing;
 sub preprocess ($$$) { #{{{
 	my $page=shift; # the page the data comes from
 	my $destpage=shift; # the page the data will appear in (different for inline)
@@ -96,6 +97,11 @@ sub preprocess ($$$) { #{{{
 		if (length $escape) {
 			return "[[$command $params]]";
 		}
+		elsif ($preprocessing{$page}++ > 10) {
+			# Avoid loops of preprocessed pages preprocessing
+			# other pages that preprocess them, etc.
+			return "[[$command preprocessing loop detected]]";
+		}
 		elsif (exists $hooks{preprocess}{$command}) {
 			# Note: preserve order of params, some plugins may
 			# consider it significant.
@@ -123,11 +129,13 @@ sub preprocess ($$$) { #{{{
 					push @params, $val, '';
 				}
 			}
-			return $hooks{preprocess}{$command}{call}->(
+			my $ret=$hooks{preprocess}{$command}{call}->(
 				@params,
 				page => $page,
 				destpage => $destpage,
 			);
+			$preprocessing{$page}--;
+			return $ret;
 		}
 		else {
 			return "[[$command not processed]]";