summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/git.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-01-26 13:05:38 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-01-26 13:05:38 -0500
commit12eb056b33e1f01a63c4fcee408c9ac0d96c6b5e (patch)
tree988f9eb2099e98141844c205f553f13203cbc0ff /IkiWiki/Plugin/git.pm
parentf8c306a21b2d7b137fbc9245079d2db8b75366e1 (diff)
parent9b436a0347e28c52a0d669be64e259b3d0323815 (diff)
Merge branch 'master' into po
Diffstat (limited to 'IkiWiki/Plugin/git.pm')
-rw-r--r--IkiWiki/Plugin/git.pm6
1 files changed, 6 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 3085a3b67..042c69f5a 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -139,6 +139,12 @@ sub safe_git (&@) {
my @lines;
while (<$OUT>) {
chomp;
+
+ # check for invalid utf-8, and toss it back to avoid crashes
+ if (! utf8::valid($_)) {
+ $_=encode_utf8($_);
+ }
+
push @lines, $_;
}