[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dbates at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ffad6558d42d8632990338801df6b482a9d95842
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 24 16:54:01 2010 +0000

    2010-10-24  Daniel Bates  <dbates at rim.com>
    
            Reviewed by David Kilzer.
    
            Fix Perl uninitialized warnings in VCSUtils::svnStatus()
            and VCSUtils::removeEOL().
            https://bugs.webkit.org/show_bug.cgi?id=48196
    
            VCSUtils::svnStatus() concatenates the output of svn status with
            a new line character and svn status may return no output (say for
            a file that has not been added, deleted, or modified). We should
            only concatenate the output of svn status if there is some.
    
            Also, VCSUtils::removeEOL() should ensure that its argument
            is initialized before performing a string substitution.
    
            * Scripts/VCSUtils.pm:
              - Modified removeEOL() to return "" if its argument is undefined.
              - Exported removeEOL() so that it can be tested.
            * Scripts/webkitperl/VCSUtils_unittest/removeEOL.pl: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70415 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index edbeb83..8229503 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,24 @@
+2010-10-24  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by David Kilzer.
+
+        Fix Perl uninitialized warnings in VCSUtils::svnStatus()
+        and VCSUtils::removeEOL().
+        https://bugs.webkit.org/show_bug.cgi?id=48196
+
+        VCSUtils::svnStatus() concatenates the output of svn status with
+        a new line character and svn status may return no output (say for
+        a file that has not been added, deleted, or modified). We should
+        only concatenate the output of svn status if there is some.
+
+        Also, VCSUtils::removeEOL() should ensure that its argument
+        is initialized before performing a string substitution.
+
+        * Scripts/VCSUtils.pm:
+          - Modified removeEOL() to return "" if its argument is undefined.
+          - Exported removeEOL() so that it can be tested. 
+        * Scripts/webkitperl/VCSUtils_unittest/removeEOL.pl: Added.
+
 2010-10-24  David Kilzer  <ddkilzer at apple.com>
 
         <http://webkit.org/b/48185> build-webkit: add support for --progress-tag switch
diff --git a/WebKitTools/Scripts/VCSUtils.pm b/WebKitTools/Scripts/VCSUtils.pm
index 360b094..faed7ed 100644
--- a/WebKitTools/Scripts/VCSUtils.pm
+++ b/WebKitTools/Scripts/VCSUtils.pm
@@ -68,6 +68,7 @@ BEGIN {
         &parsePatch
         &pathRelativeToSVNRepositoryRootForPath
         &prepareParsedPatch
+        &removeEOL
         &runPatchCommand
         &scmMoveOrRenameFile
         &scmToggleExecutableBit
@@ -413,6 +414,7 @@ sub canonicalizePath($)
 sub removeEOL($)
 {
     my ($line) = @_;
+    return "" unless $line;
 
     $line =~ s/[\r\n]+$//g;
     return $line;
diff --git a/WebKitTools/Scripts/webkitperl/VCSUtils_unittest/removeEOL.pl b/WebKitTools/Scripts/webkitperl/VCSUtils_unittest/removeEOL.pl
new file mode 100644
index 0000000..8bd8e90
--- /dev/null
+++ b/WebKitTools/Scripts/webkitperl/VCSUtils_unittest/removeEOL.pl
@@ -0,0 +1,56 @@
+#!/usr/bin/perl
+#
+# Copyright (C) Research In Motion Limited 2010. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Research In Motion Limited nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Unit tests of VCSUtils::removeEOL().
+
+use Test::Simple tests => 5;
+use VCSUtils;
+
+my $title;
+
+# New test
+$title = "removeEOL: Undefined argument.";
+ok(removeEOL(undef) eq "");
+
+# New test
+$title = "removeEOL: Line with Windows line ending.";
+ok(removeEOL("This line ends with a Windows line ending.\r\n") eq "This line ends with a Windows line ending.");
+
+# New test
+$title = "removeEOL: Line with Unix line ending.";
+ok(removeEOL("This line ends with a Unix line ending.\n") eq "This line ends with a Unix line ending.");
+
+# New test
+$title = "removeEOL: Line with Mac line ending.";
+ok(removeEOL("This line ends with a Mac line ending.\r") eq "This line ends with a Mac line ending.");
+
+# New test
+$title = "removeEOL: Line with a mix of line endings.";
+ok(removeEOL("This line contains a mix of line endings.\r\n\r\n\r\r\n\n\n\n") eq "This line contains a mix of line endings.");

-- 
WebKit Debian packaging