word: prevent infinite loops on invalid data

[sheet.git] / word.plp

diff --git a/word.plp b/word.plp
index a7acea5ae10d9874e3324b8ffc4117ed27077531..64a093fed42afa818d8185450b8815e80e82cedd 100644 (file)
--- a/word.plp
+++ b/word.plp
@@ -1,8 +1,12 @@
 <(common.inc.plp)><:
 
-if ($Request and $Request =~ s{^edit/?}{}) {
-       Include 'writer.plp';
-       exit;
+if ($Request and $Request =~ m{\A([^/]+)}) {
+       my $page = "word/$1.plp";
+       utf8::downgrade($page); # unicode filename breaks contents encoding
+       if (-e $page) {
+               Include $page;
+               exit;
+       }
 }
 
 my $lang = $get{lang} || 'en';
@@ -85,6 +89,7 @@ sub printimgs {
        say '<ul>';
        for my $row (@_) {
                my ($id, $level, $title) = split /:/, $row, 3;
+               $id or die "empty reference"; # assertion to prevent loops
                my @type;
                push @type, 'parent' if defined $table->{$id};
                push @type, 'large'  if $level =~ s/c$//;