Changeset 62755 in webkit

Timestamp:

Jul 7, 2010 9:37:04 PM (14 years ago)

Author:

dbates@webkit.org

Message:

2010-07-07 Daniel Bates <​dbates@rim.com>

Reviewed by Dumitru Daniliuc.

VCSUtils.pm complains about uninitialized value $newLine
​https://bugs.webkit.org/show_bug.cgi?id=41333

Fixes an issue where VCSUtils::fixChangeLogPatch() may read off the end of
an array when fixing a change log entry that overlaps with an earlier
entry. In particular, when a patch contains a change log entry inserted
earlier in the change log file, but after an entry with the same author
and date.

• Scripts/VCSUtils.pm:
  • Added for-loop constraint to fixChangeLogPatch() so that it does not read off the end of the @overlappingLines array.
• Scripts/webkitperl/VCSUtils_unittest/fixChangeLogPatch.pl: Added unit test.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (1 diff)
• Scripts/webkitperl/VCSUtils_unittest/fixChangeLogPatch.pl (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-07-07  Daniel Bates  <dbates@rim.com>
+
+        Reviewed by Dumitru Daniliuc.
+
+        VCSUtils.pm complains about uninitialized value $newLine
+        https://bugs.webkit.org/show_bug.cgi?id=41333
+
+        Fixes an issue where VCSUtils::fixChangeLogPatch() may read off the end of
+        an array when fixing a change log entry that overlaps with an earlier
+        entry. In particular, when a patch contains a change log entry inserted
+        earlier in the change log file, but after an entry with the same author
+        and date.
+
+        * Scripts/VCSUtils.pm:
+            - Added for-loop constraint to fixChangeLogPatch() so that it does not
+              read off the end of the @overlappingLines array.
+        * Scripts/webkitperl/VCSUtils_unittest/fixChangeLogPatch.pl: Added unit test.
+
 2010-07-07  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKitTools/Scripts/VCSUtils.pm

@@ -1301 +1301 @@
     # Work backwards, shifting overlapping lines towards front
     # while checking that patch stays equivalent.
-    for ($i = $dateStartIndex - 1; $i >= $chunkStartIndex; --$i) {
+    for ($i = $dateStartIndex - 1; @overlappingLines && $i >= $chunkStartIndex; --$i) {
         my $line = $lines[$i];
         if (substr($line, 0, 1) ne " ") {

trunk/WebKitTools/Scripts/webkitperl/VCSUtils_unittest/fixChangeLogPatch.pl

@@ -31 +31 @@
 # Unit tests of VCSUtils::fixChangeLogPatch().
 
-use Test::Simple tests => 7;
+use Test::Simple tests => 8;
 use VCSUtils;
 
@@ -119 +119 @@
  
          * File:
+END
+
+ok(fixChangeLogPatch($in) eq $in, $title);
+
+# New test
+$title = "fixChangeLogPatch: [no change] New entry inserted earlier in the file, but after an entry with the same author and date.";
+
+$in = <<'END';
+--- ChangeLog
++++ ChangeLog
+@@ -70,6 +70,14 @@
+ 
+ 2009-12-22  Alice  <alice@email.address>
+ 
++        Reviewed by Sue.
++
++        Changed some more code on 2009-12-22.
++
++        * File:
++
++2009-12-22  Alice  <alice@email.address>
++
+         Reviewed by Ray.
+ 
+         Changed some code on 2009-12-22.
 END