urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

call decode_utf8 inside eval 

holger reported that decode_utf8 was crashing with perl 5.8.8. Earlier, I
thought that passing 0 to the function avoided this with old perls, but
that was apparently not enough, it still crashes. So, put it inside the
eval, so we can at least recover from it crashing.
Joey Hess 2008-11-17 15:56:15 -05:00
parent 7aad3b6047
commit 75f262f44d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IkiWiki/Plugin/aggregate.pm
View File

@ -496,15 +496,19 @@ sub aggregate (@) { #{{{
# that contains invalid UTF-8 sequences. Convert
# feed to ascii to try to work around.
$feed->{message}.=" ".sprintf(gettext("(invalid UTF-8 stripped from feed)"));
$content=Encode::decode_utf8($content, 0);
$f=eval{XML::Feed->parse(\$content)};
$f=eval {
$content=Encode::decode_utf8($content, 0);
XML::Feed->parse(\$content)
};
}
if ($@) {
# Another possibility is badly escaped entities.
$feed->{message}.=" ".sprintf(gettext("(feed entities escaped)"));
$content=~s/\&(?!amp)(\w+);/&$1;/g;
$content=Encode::decode_utf8($content, 0);
$f=eval{XML::Feed->parse(\$content)};
$f=eval {
$content=Encode::decode_utf8($content, 0);
XML::Feed->parse(\$content)
};
}
if ($@) {
$feed->{message}=gettext("feed crashed XML::Feed!")." ($@)";