ikiwiki-mass-rebuild: Fix tty hijacking vulnerability by using su. (Once su's related...

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d2f7dcc06b7eb4ef3579e33bbefb82cfdfacaa1a..443c7044796a29947936fd5de57e8e09c14bfec4 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -334,6 +334,10 @@ sub readfile ($;$$) { #{{{
        binmode($in) if ($binary);
        return \*$in if $wantfd;
        my $ret=<$in>;
+       # check for invalid utf-8, and toss it back to avoid crashes
+       if (! utf8::valid($ret)) {
+               $ret=encode_utf8($ret);
+       }
        close $in || error("failed to read $file: $!");
        return $ret;
 } #}}}