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

taint handling for rev

master
Joey Hess 2010-10-08 18:58:47 -04:00
parent c430792148
commit 4efc1f22d4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki/Plugin/git.pm
View File

@ -836,20 +836,22 @@ sub rcs_receive () {
sub rcs_preprevert ($) { sub rcs_preprevert ($) {
my $rev=shift; my $rev=shift;
my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
return git_parse_changes(git_commit_info($rev, 1)); return git_parse_changes(git_commit_info($sha1, 1));
} }
sub rcs_revert ($) { sub rcs_revert ($) {
# Try to revert the given rev; returns undef on _success_. # Try to revert the given rev; returns undef on _success_.
my $rev = shift; my $rev = shift;
my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
if (run_or_non('git', 'revert', '--no-commit', $rev)) { if (run_or_non('git', 'revert', '--no-commit', $sha1)) {
return undef; return undef;
} }
else { else {
run_or_die('git', 'reset', '--hard'); run_or_die('git', 'reset', '--hard');
return sprintf(gettext("Failed to revert commit %s"), $rev); return sprintf(gettext("Failed to revert commit %s"), $sha1);
} }
} }