From acb07ef4164643ac0dac28aab2ceae24510e5641 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 10 Jul 2013 17:02:24 -0400 Subject: [PATCH] Fix crash that could occur when a needsbuild hook returned a file that does not exist. I saw this happen with calendar, when it wanted to update a page, that had a calendar on it, but the page had just been deleted. This caused srcfile_stat to crash. --- IkiWiki/Render.pm | 10 +++++++++- debian/changelog | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index a90d202ee..c41dac9f6 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -770,9 +770,17 @@ sub refresh () { my ($new, $internal_new)=find_new_files($files); my ($del, $internal_del)=find_del_files($pages); my ($changed, $internal_changed)=find_changed($files); + my %existingfiles; run_hooks(needsbuild => sub { my $ret=shift->($changed, [@$del, @$internal_del]); - $changed=$ret if ref $ret eq 'ARRAY'; + if (ref $ret eq 'ARRAY') { + if (! %existingfiles) { + foreach my $f (@$files) { + $existingfiles{$f}=1; + } + } + @$changed=grep $existingfiles{$_}, @$ret; + } }); my $oldlink_targets=calculate_old_links($changed, $del); diff --git a/debian/changelog b/debian/changelog index 04feaffcb..c3f4db798 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ ikiwiki (3.20130519) UNRELEASED; urgency=low accessed via https. * The ip() pagespec can now contain glob characters to match eg, a subnet full of spammers. + * Fix crash that could occur when a needsbuild hook returned a file + that does not exist. -- Joey Hess Sun, 23 Jun 2013 14:02:01 -0400 -- 2.39.5