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

git: don't issue a warning if rcsinfo is undefined 

The intention here seems to be that $prev may be undefined, and the
only way that can legitimately happen is for $params{token} to be
undefined too.
master
Simon McVittie 2016-12-24 14:34:30 +00:00
parent 7c34df633d
commit a67f4d3944
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IkiWiki/Plugin/git.pm
View File

@ -567,7 +567,10 @@ sub rcs_commit (@) {
# Check to see if the page has been changed by someone else since # Check to see if the page has been changed by someone else since
# rcs_prepedit was called. # rcs_prepedit was called.
my $cur = git_sha1_file($params{file}); my $cur = git_sha1_file($params{file});
my ($prev) = $params{token} =~ /^($sha1_pattern)$/; # untaint my $prev;
if (defined $params{token}) {
($prev) = $params{token} =~ /^($sha1_pattern)$/; # untaint
}
if (defined $cur && defined $prev && $cur ne $prev) { if (defined $cur && defined $prev && $cur ne $prev) {
my $conflict = merge_past($prev, $params{file}, $dummy_commit_msg); my $conflict = merge_past($prev, $params{file}, $dummy_commit_msg);

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ ikiwiki (3.20161220) UNRELEASED; urgency=medium
* Add CVE references for CVE-2016-10026 * Add CVE references for CVE-2016-10026
* Add missing ikiwiki.setup for the manual test for CVE-2016-10026 * Add missing ikiwiki.setup for the manual test for CVE-2016-10026
* git: don't issue a warning if the rcsinfo CGI parameter is undefined
-- Simon McVittie <smcv@debian.org> Wed, 21 Dec 2016 13:03:07 +0000 -- Simon McVittie <smcv@debian.org> Wed, 21 Dec 2016 13:03:07 +0000