undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvsserver: Determinize output to combat Perl 5.18 hash randomization

Browse Source 
Perl 5.18 randomizes the seed used by its hash function, so iterating
through hashes results in different orders from run to run:
  http://perldoc.perl.org/perl5180delta.html#Hash-overhaul

This usually broke t9400 (gitcvs.dbname, gitcvs.ext.dbname, when
running cmp on two .sqlite files) and t9402 (check [cvswork3] diff,
when running test_cmp on two diffs).

To fix this, hide the internal order of hashes with sort when sending
output or running database queries.

(An alternative workaround is PERL_HASH_SEED=0, but this seems nicer.)

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Anders Kaseorg 2013-10-30 04:44:43 -04:00 committed by Junio C Hamano
parent 1b48d56cfb
commit 9462953ad2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-cvsserver.perl
View File

@ -430,10 +430,10 @@ sub req_validrequests
$log->debug("req_validrequests"); $log->debug("req_validrequests");
$log->debug("SEND : Valid-requests " . join(" ",keys %$methods)); $log->debug("SEND : Valid-requests " . join(" ",sort keys %$methods));
$log->debug("SEND : ok"); $log->debug("SEND : ok");
print "Valid-requests " . join(" ",keys %$methods) . "\n"; print "Valid-requests " . join(" ",sort keys %$methods) . "\n";
print "ok\n"; print "ok\n";
} }
@ -2124,7 +2124,7 @@ sub req_diff
print "M retrieving revision $meta2->{revision}\n" print "M retrieving revision $meta2->{revision}\n"
} }
print "M diff "; print "M diff ";
foreach my $opt ( keys %{$state->{opt}} ) foreach my $opt ( sort keys %{$state->{opt}} )
{ {
if ( ref $state->{opt}{$opt} eq "ARRAY" ) if ( ref $state->{opt}{$opt} eq "ARRAY" )
{ {
@ -4050,7 +4050,7 @@ sub update
close FILELIST; close FILELIST;
# Detect deleted files # Detect deleted files
foreach my $file ( keys %$head ) foreach my $file ( sort keys %$head )
{ {
unless ( exists $seen_files->{$file} or $head->{$file}{filehash} eq "deleted" ) unless ( exists $seen_files->{$file} or $head->{$file}{filehash} eq "deleted" )
{ {
@ -4078,7 +4078,7 @@ sub update
} }
$self->delete_head(); $self->delete_head();
foreach my $file ( keys %$head ) foreach my $file ( sort keys %$head )
{ {
$self->insert_head( $self->insert_head(
$file, $file,